From a74902cccde539ee2bd216caec0da6eb54b67c1b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 18 Feb 2017 16:09:16 +0100 Subject: dirmngr: Add per-session verify callback to http.c * dirmngr/http.h (http_verify_cb_t): New type. * dirmngr/http.c (http_session_s): Add fields flags, verify_cb, and verify_cb_value. (http_session_new): Remove arg tls_priority. Add args verify_cb and verify-cb_value. Store them in the session object. (send_request): Use per-session verify callback. (http_verify_server_credentials) [HTTP_USE_NTBTLS]: Return GPG_ERR_NOT_IMPLEMENTED. * dirmngr/ks-engine-hkp.c (send_request): Adjust for changed http_session_new. * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto. * dirmngr/t-http.c (main): Ditto. * dirmngr/server.c (do_get_cert_local): Replace xmalloc by malloc. Signed-off-by: Werner Koch --- dirmngr/server.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'dirmngr/server.c') diff --git a/dirmngr/server.c b/dirmngr/server.c index 1134ac081..92bbc160b 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -370,14 +370,15 @@ do_get_cert_local (ctrl_t ctrl, const char *name, const char *command) char *buf; ksba_cert_t cert; - if (name) - buf = xstrconcat (command, " ", name, NULL); + buf = name? strconcat (command, " ", name, NULL) : xtrystrdup (command); + if (!buf) + rc = gpg_error_from_syserror (); else - buf = xstrdup (command); - - rc = assuan_inquire (ctrl->server_local->assuan_ctx, buf, - &value, &valuelen, MAX_CERT_LENGTH); - xfree (buf); + { + rc = assuan_inquire (ctrl->server_local->assuan_ctx, buf, + &value, &valuelen, MAX_CERT_LENGTH); + xfree (buf); + } if (rc) { log_error (_("assuan_inquire(%s) failed: %s\n"), -- cgit v1.2.3