mirror of https://github.com/getdnsapi/getdns.git
Merge branch 'develop' into my-develop
This commit is contained in:
commit
2e4070a3cd
|
@ -23,5 +23,5 @@ addons:
|
|||
script:
|
||||
- mkdir tests
|
||||
- cd tests
|
||||
# - ../src/test/tpkg/run-all.sh
|
||||
- ../src/test/tpkg/run-one.sh 290-transports.tpkg -V
|
||||
- ../src/test/tpkg/run-all.sh
|
||||
# - ../src/test/tpkg/run-one.sh 290-transports.tpkg -V
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
* Contains functions to translate the wireformat to text
|
||||
* representation, as well as functions to print them.
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include "config.h"
|
||||
#include "gldns/wire2str.h"
|
||||
#include "gldns/str2wire.h"
|
||||
|
|
|
@ -957,7 +957,9 @@ tls_create_object(getdns_dns_req *dnsreq, int fd, getdns_upstream *upstream)
|
|||
}
|
||||
}
|
||||
|
||||
_getdns_tls_connection_set_host_pinset(tls, upstream->tls_auth_name, upstream->tls_pubkey_pinset);
|
||||
if (upstream->tls_pubkey_pinset)
|
||||
_getdns_tls_connection_set_host_pinset(
|
||||
tls, upstream->tls_auth_name, upstream->tls_pubkey_pinset);
|
||||
|
||||
/* Session resumption. There are trade-offs here. Want to do it when
|
||||
possible only if we have the right type of connection. Note a change
|
||||
|
|
Loading…
Reference in New Issue