fix windows and amiga frontends to cope with certificate chain changes

This commit is contained in:
Vincent Sanders 2020-02-23 17:25:19 +00:00
parent 7039973a1f
commit 338dd004f2
3 changed files with 6 additions and 8 deletions

View File

@ -19,7 +19,7 @@
#ifndef AMIGA_SSLCERT_H #ifndef AMIGA_SSLCERT_H
#define AMIGA_SSLCERT_H #define AMIGA_SSLCERT_H
struct nsurl; struct nsurl;
struct ssl_cert_info; struct cert_chain;
/** /**
* Prompt the user to verify a certificate with issues. * Prompt the user to verify a certificate with issues.
@ -32,7 +32,7 @@ struct ssl_cert_info;
* \return NSERROR_OK or error code if prompt creation failed. * \return NSERROR_OK or error code if prompt creation failed.
*/ */
nserror ami_cert_verify(struct nsurl *url, nserror ami_cert_verify(struct nsurl *url,
const struct ssl_cert_info *certs, unsigned long num, const struct cert_chain *chain,
nserror (*cb)(bool proceed, void *pw), void *cbpw); nserror (*cb)(bool proceed, void *pw), void *cbpw);
#endif #endif

View File

@ -170,8 +170,7 @@ nsw32_sslcert_viewer_close(struct nsw32_corewindow *nsw32_cw)
/* exported interface documented in nsw32/ssl_cert.h */ /* exported interface documented in nsw32/ssl_cert.h */
nserror nsw32_cert_verify(struct nsurl *url, nserror nsw32_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), nserror (*cb)(bool proceed, void *pw),
void *cbpw) void *cbpw)
{ {
@ -184,8 +183,7 @@ nserror nsw32_cert_verify(struct nsurl *url,
} }
/* initialise certificate viewing interface */ /* 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);
&ncwin->ssl_data);
if (res != NSERROR_OK) { if (res != NSERROR_OK) {
free(ncwin); free(ncwin);
return res; return res;

View File

@ -25,7 +25,7 @@
#define NETSURF_WINDOWS_SSL_CERT_H 1 #define NETSURF_WINDOWS_SSL_CERT_H 1
struct nsurl; struct nsurl;
struct ssl_cert_info; struct cert_chain;
/** /**
* Prompt the user to verify a certificate with issuse. * Prompt the user to verify a certificate with issuse.
@ -37,7 +37,7 @@ struct ssl_cert_info;
* \param cbpw Context pointer passed to cb * \param cbpw Context pointer passed to cb
* \return NSERROR_OK or error code if prompt creation failed. * \return NSERROR_OK or error code if prompt creation failed.
*/ */
nserror nsw32_cert_verify(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw); nserror nsw32_cert_verify(struct nsurl *url, const struct cert_chain *certs, nserror (*cb)(bool proceed, void *pw), void *cbpw);
/** /**
* Create the ssl viewer window class. * Create the ssl viewer window class.