From e4b0d08fade28c28103ef2ac443fdc3e2c1c69f9 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Tue, 5 Apr 2016 13:15:59 -0300 Subject: [PATCH] Minor bugfix for use with openssl 1.1.0 --- src/pubkey-pinning.c | 3 +-- src/stub.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pubkey-pinning.c b/src/pubkey-pinning.c index 5263882b..8a2250d8 100644 --- a/src/pubkey-pinning.c +++ b/src/pubkey-pinning.c @@ -396,8 +396,7 @@ _getdns_verify_pinset_match(const sha256_pin_t *pinset, #if defined(STUB_DEBUG) && STUB_DEBUG DEBUG_STUB("%s %-35s: Name of cert: %d ", STUB_DEBUG_SETUP_TLS, __FUNCTION__, i); - if (x->cert_info->subject != NULL) - X509_NAME_print_ex_fp(stderr, X509_get_subject_name(x), 1, XN_FLAG_ONELINE); + X509_NAME_print_ex_fp(stderr, X509_get_subject_name(x), 1, XN_FLAG_ONELINE); fprintf(stderr, "\n"); #endif /* digest the cert with sha256 */ diff --git a/src/stub.c b/src/stub.c index 1b574d99..35330fa3 100644 --- a/src/stub.c +++ b/src/stub.c @@ -2050,6 +2050,12 @@ _getdns_submit_stub_request(getdns_network_req *netreq) * dnsreq->loop. The asynchronous is always also available * at the upstream as upstream->loop. */ + if (is_synchronous_request(netreq)) { + DEBUG_STUB("%s %-35s: MSG: %p TYPE: %d SYNCHROUNOUS\n", STUB_DEBUG_ENTRY, __FUNCTION__, netreq, netreq->request_type); + } else { + DEBUG_STUB("%s %-35s: MSG: %p TYPE: %d asynchronous\n", STUB_DEBUG_ENTRY, __FUNCTION__, netreq, netreq->request_type); + } + GETDNS_SCHEDULE_EVENT( dnsreq->loop, /* Synchronous lookup?, then this event will be used to