Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/338dd004f22b8c630ac1ff085b53ef34ab018ed4
...commit
http://git.netsurf-browser.org/netsurf.git/commit/338dd004f22b8c630ac1ff085b53ef34ab018ed4
...tree
http://git.netsurf-browser.org/netsurf.git/tree/338dd004f22b8c630ac1ff085b53ef34ab018ed4
The branch, master has been updated
via 338dd004f22b8c630ac1ff085b53ef34ab018ed4 (commit)
from 7039973a1f886fb5651c94495a042eba5940a4d9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=338dd004f22b8c630ac1ff085b53ef34ab018ed4
commit 338dd004f22b8c630ac1ff085b53ef34ab018ed4
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix windows and amiga frontends to cope with certificate chain changes
diff --git a/frontends/amiga/sslcert.h b/frontends/amiga/sslcert.h
index 392989f..114d557 100644
--- a/frontends/amiga/sslcert.h
+++ b/frontends/amiga/sslcert.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_SSLCERT_H
#define AMIGA_SSLCERT_H
struct nsurl;
-struct ssl_cert_info;
+struct cert_chain;
/**
* 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.
*/
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);
#endif
diff --git a/frontends/windows/ssl_cert.c b/frontends/windows/ssl_cert.c
index 4db0616..1e78871 100644
--- a/frontends/windows/ssl_cert.c
+++ b/frontends/windows/ssl_cert.c
@@ -170,8 +170,7 @@ nsw32_sslcert_viewer_close(struct nsw32_corewindow
*nsw32_cw)
/* exported interface documented in nsw32/ssl_cert.h */
nserror nsw32_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)
{
@@ -184,8 +183,7 @@ nserror nsw32_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) {
free(ncwin);
return res;
diff --git a/frontends/windows/ssl_cert.h b/frontends/windows/ssl_cert.h
index 6c1f041..eebfb06 100644
--- a/frontends/windows/ssl_cert.h
+++ b/frontends/windows/ssl_cert.h
@@ -25,7 +25,7 @@
#define NETSURF_WINDOWS_SSL_CERT_H 1
struct nsurl;
-struct ssl_cert_info;
+struct cert_chain;
/**
* Prompt the user to verify a certificate with issuse.
@@ -37,7 +37,7 @@ struct ssl_cert_info;
* \param cbpw Context pointer passed to cb
* \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.
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/sslcert.h | 4 ++--
frontends/windows/ssl_cert.c | 6 ++----
frontends/windows/ssl_cert.h | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/frontends/amiga/sslcert.h b/frontends/amiga/sslcert.h
index 392989f..114d557 100644
--- a/frontends/amiga/sslcert.h
+++ b/frontends/amiga/sslcert.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_SSLCERT_H
#define AMIGA_SSLCERT_H
struct nsurl;
-struct ssl_cert_info;
+struct cert_chain;
/**
* 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.
*/
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);
#endif
diff --git a/frontends/windows/ssl_cert.c b/frontends/windows/ssl_cert.c
index 4db0616..1e78871 100644
--- a/frontends/windows/ssl_cert.c
+++ b/frontends/windows/ssl_cert.c
@@ -170,8 +170,7 @@ nsw32_sslcert_viewer_close(struct nsw32_corewindow
*nsw32_cw)
/* exported interface documented in nsw32/ssl_cert.h */
nserror nsw32_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)
{
@@ -184,8 +183,7 @@ nserror nsw32_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) {
free(ncwin);
return res;
diff --git a/frontends/windows/ssl_cert.h b/frontends/windows/ssl_cert.h
index 6c1f041..eebfb06 100644
--- a/frontends/windows/ssl_cert.h
+++ b/frontends/windows/ssl_cert.h
@@ -25,7 +25,7 @@
#define NETSURF_WINDOWS_SSL_CERT_H 1
struct nsurl;
-struct ssl_cert_info;
+struct cert_chain;
/**
* Prompt the user to verify a certificate with issuse.
@@ -37,7 +37,7 @@ struct ssl_cert_info;
* \param cbpw Context pointer passed to cb
* \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.
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
