diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2016-07-31 01:24:57 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2016-07-31 13:25:20 +0100 |
| commit | b939afe3fc70be446d9ffd6e6071a4af5cf98a8a (patch) | |
| tree | 65c10f7b9d363f20621e2b4429f4eb3c958fa986 /desktop | |
| parent | 51725592c96b3cb94aa70761b10960c738815534 (diff) | |
| download | netsurf-b939afe3fc70be446d9ffd6e6071a4af5cf98a8a.tar.gz netsurf-b939afe3fc70be446d9ffd6e6071a4af5cf98a8a.tar.bz2 | |
Allow certificate verification user prompt creation to return errors
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/gui_factory.c | 4 | ||||
| -rw-r--r-- | desktop/netsurf.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index cecbe6e79..88bb9baf5 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -685,13 +685,13 @@ static nserror gui_default_launch_url(struct nsurl *url) } -static void gui_default_cert_verify(nsurl *url, +static nserror gui_default_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw) { - cb(false, cbpw); + return NSERROR_NOT_IMPLEMENTED; } static void gui_default_401login_open(nsurl *url, const char *realm, diff --git a/desktop/netsurf.c b/desktop/netsurf.c index ffcec0420..f1daeab05 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -104,21 +104,25 @@ static void netsurf_lwc_iterator(lwc_string *str, void *pw) static nserror netsurf_llcache_query_handler(const llcache_query *query, void *pw, llcache_query_response cb, void *cbpw) { + nserror res = NSERROR_OK; + switch (query->type) { case LLCACHE_QUERY_AUTH: guit->misc->login(query->url, query->data.auth.realm, cb, cbpw); break; + case LLCACHE_QUERY_REDIRECT: /** \todo Need redirect query dialog */ /* For now, do nothing, as this query type isn't emitted yet */ break; + case LLCACHE_QUERY_SSL: - guit->misc->cert_verify(query->url, query->data.ssl.certs, + res = guit->misc->cert_verify(query->url, query->data.ssl.certs, query->data.ssl.num, cb, cbpw); break; } - return NSERROR_OK; + return res; } /* exported interface documented in netsurf/netsurf.h */ |