Merge pull request #161 from wtoorop/develop

minor openssl 1.1.0 bugfix
This commit is contained in:
Melinda Shore 2016-04-05 16:06:29 -08:00
commit 0a7f80ccbe
2 changed files with 7 additions and 2 deletions

View File

@ -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 */

View File

@ -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