interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into my-develop

This commit is contained in:
Jim Hague 2020-03-03 14:51:17 +00:00
parent 38627fbb01 689415971a
commit 2e4070a3cd
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -23,5 +23,5 @@ addons:
script: script:
- mkdir tests - mkdir tests
- cd tests - cd tests
# - ../src/test/tpkg/run-all.sh - ../src/test/tpkg/run-all.sh
- ../src/test/tpkg/run-one.sh 290-transports.tpkg -V # - ../src/test/tpkg/run-one.sh 290-transports.tpkg -V

1
src/gldns/wire2str.c
View File

@ -14,6 +14,7 @@
* Contains functions to translate the wireformat to text * Contains functions to translate the wireformat to text
* representation, as well as functions to print them. * representation, as well as functions to print them.
*/ */
#include <stdlib.h>
#include "config.h" #include "config.h"
#include "gldns/wire2str.h" #include "gldns/wire2str.h"
#include "gldns/str2wire.h" #include "gldns/str2wire.h"

4
src/stub.c
View File

@ -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 /* 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 possible only if we have the right type of connection. Note a change