diff options
| author | Werner Koch <[email protected]> | 2017-02-19 09:36:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-02-19 09:36:43 +0000 |
| commit | 64fffd0ce2a4fd9cba152cf07497b585410cc652 (patch) | |
| tree | c0fc74bc3ef44fc1db161e71c55486400a9ab1fa /dirmngr/dirmngr.c | |
| parent | dirmngr: Add per-session verify callback to http.c (diff) | |
| download | gnupg-64fffd0ce2a4fd9cba152cf07497b585410cc652.tar.gz gnupg-64fffd0ce2a4fd9cba152cf07497b585410cc652.zip | |
dirmngr: First take on ntbtls cert verification.
* dirmngr/http-ntbtls.c: New.
* dirmngr/Makefile.am (dirmngr_SOURCES): Add file.
* dirmngr/dirmngr.h (SERVER_CONTROL_MAGIC): New.
(server_conrol_s): Add field 'magic',
* dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Set MAGIC.
(dirmngr_deinit_default_ctrl): Set MAGIC to deadbeef.
* dirmngr/http.c (my_ntbtls_verify_cb): New.
(http_session_new) [HTTP_USE_NTBTLS]: Remove all CA setting code.
(send_request) [HTTP_USE_NTBTLS]: Set the verify callback. Do not call
the verify callback after the handshake.
* dirmngr/ks-engine-hkp.c (send_request): Pass
gnupg_http_tls_verify_cb to http_session_new.
* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
* dirmngr/t-http.c (my_http_tls_verify_cb): New.
(main): Rename option --gnutls-debug to --tls-debug.
(main) [HTTP_USE_NTBTLS]: Create a session.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
| -rw-r--r-- | dirmngr/dirmngr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index bb07656a5..718296d0f 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1468,6 +1468,7 @@ dirmngr_exit (int rc) void dirmngr_init_default_ctrl (ctrl_t ctrl) { + ctrl->magic = SERVER_CONTROL_MAGIC; if (opt.http_proxy) ctrl->http_proxy = xstrdup (opt.http_proxy); } @@ -1478,6 +1479,8 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl) { if (!ctrl) return; + ctrl->magic = 0xdeadbeef; + xfree (ctrl->http_proxy); ctrl->http_proxy = NULL; } |