Merge branch 'v0.5.0' of github.com:getdnsapi/getdns into v0.5.0

This commit is contained in:
Willem Toorop 2015-10-27 16:39:09 +01:00
commit 3c5f2d4c4d
1 changed files with 2 additions and 2 deletions

View File

@ -913,7 +913,7 @@ tls_create_object(getdns_dns_req *dnsreq, int fd, getdns_upstream *upstream)
SSL_set_verify(ssl, SSL_VERIFY_PEER, tls_verify_callback);
else {
SSL_set_verify(ssl, SSL_VERIFY_NONE, tls_verify_callback_with_fallback);
SSL_CTX_set_cipher_list(context->tls_ctx, NULL);
SSL_set_cipher_list(ssl, "DEFAULT");
}
} else {
/* Lack of host name is OK unless only authenticated TLS is specified*/
@ -926,7 +926,7 @@ tls_create_object(getdns_dns_req *dnsreq, int fd, getdns_upstream *upstream)
DEBUG_STUB("--- %s, PROCEEDING WITHOUT HOSTNAME VALIDATION!!\n", __FUNCTION__);
upstream->tls_auth_failed = 1;
SSL_set_verify(ssl, SSL_VERIFY_NONE, tls_verify_callback_with_fallback);
SSL_CTX_set_cipher_list(context->tls_ctx, NULL);
SSL_set_cipher_list(ssl, "DEFAULT");
}
}