diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 854d6b085..888729e10 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -298,7 +298,7 @@ ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win)
 
 /* exported interface documented in amiga/ssl_cert.h */
 nserror ami_cert_verify(struct nsurl *url,
-						const struct ssl_cert_info *certs,
+						const struct cert_chain *chain,
 						unsigned long num,
 						nserror (*cb)(bool proceed, void *pw),
 						void *cbpw)
@@ -346,8 +346,7 @@ nserror ami_cert_verify(struct nsurl *url,
 	}
 
 	/* initialise certificate viewing interface */
-	res = sslcert_viewer_create_session_data(num, url, cb, cbpw, certs,
-									   &ncwin->ssl_data);
+	res = sslcert_viewer_create_session_data(url, cb, cbpw, chain, &ncwin->ssl_data);
 	if (res != NSERROR_OK) {
 		ami_utf8_free(ncwin->core.wintitle);
 		ami_utf8_free(ncwin->sslerr);
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index a5df8fcb0..bc4c0ffeb 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -762,8 +762,8 @@ static void gui_set_clipboard(const char *buffer, size_t length,
 }
 
 static nserror
-gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
-		unsigned long num, nserror (*cb)(bool proceed, void *pw),
+gui_cert_verify(nsurl *url, const struct cert_chain *chain,
+		nserror (*cb)(bool proceed, void *pw),
 		void *cbpw)
 {
         struct sslcert_session_data *data;
@@ -781,8 +781,7 @@ gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
                 cb(false, cbpw);
         } else if(b == 3) {
                 // Inspect
-                sslcert_viewer_create_session_data(num, url, cb, cbpw, certs,
-                                                   &data);
+                sslcert_viewer_create_session_data(url, cb, cbpw, chain, &data);
                 atari_sslcert_viewer_open(data);
         }
 	return NSERROR_OK;
diff --git a/frontends/monkey/cert.c b/frontends/monkey/cert.c
index ddcd1137c..3ec2fbee0 100644
--- a/frontends/monkey/cert.c
+++ b/frontends/monkey/cert.c
@@ -40,8 +40,8 @@ static uint32_t cert_ctr = 0;
 
 nserror
 gui_cert_verify(nsurl *url,
-		const struct ssl_cert_info *certs,
-		unsigned long num, nserror (*cb)(bool proceed, void *pw),
+		const struct cert_chain *chain,
+		nserror (*cb)(bool proceed, void *pw),
 		void *cbpw)
 {
 	struct monkey_cert *mcrt_ctx;
diff --git a/frontends/monkey/cert.h b/frontends/monkey/cert.h
index 56feea782..ff499ed16 100644
--- a/frontends/monkey/cert.h
+++ b/frontends/monkey/cert.h
@@ -19,11 +19,11 @@
 #ifndef NETSURF_MONKEY_CERT_H
 #define NETSURF_MONKEY_CERT_H
 
-struct ssl_cert_info;
+struct cert_chain;
 
-nserror gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
-                unsigned long num, nserror (*cb)(bool proceed, void *pw),
-                void *cbpw);
+nserror gui_cert_verify(nsurl *url, const struct cert_chain *certs,
+			nserror (*cb)(bool proceed, void *pw),
+			void *cbpw);
 
 
 void monkey_sslcert_handle_command(int argc, char **argv);
diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c
index 961e48339..815f7e910 100644
--- a/frontends/riscos/sslcert.c
+++ b/frontends/riscos/sslcert.c
@@ -312,8 +312,7 @@ cert_mouse(struct ro_corewindow *ro_cw,
 /* exported interface documented in riscos/sslcert.h */
 nserror
 gui_cert_verify(nsurl *url,
-		const struct ssl_cert_info *certs,
-		unsigned long num,
+		const struct cert_chain *chain,
 		nserror (*cb)(bool proceed, void *pw),
 		void *cbpw)
 {
@@ -327,7 +326,7 @@ gui_cert_verify(nsurl *url,
 	}
 
 	/* initialise certificate viewing interface */
-	res = sslcert_viewer_create_session_data(num, url, cb, cbpw, certs,
+	res = sslcert_viewer_create_session_data(url, cb, cbpw, chain,
 						 &ncwin->ssl_data);
 	if (res != NSERROR_OK) {
 		free(ncwin);
diff --git a/frontends/riscos/sslcert.h b/frontends/riscos/sslcert.h
index 09607f04c..613db1a47 100644
--- a/frontends/riscos/sslcert.h
+++ b/frontends/riscos/sslcert.h
@@ -41,7 +41,7 @@ void ro_gui_cert_initialise(void);
  * \param cb Callback upon user decision.
  * \param cbpw Context pointer passed to cb
  */
-nserror gui_cert_verify(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw);
+nserror gui_cert_verify(struct nsurl *url, const struct cert_chain *chain, nserror (*cb)(bool proceed, void *pw), void *cbpw);
 
 #endif