From 7b6fdf425a9ef38fe9e16779b3af25863104d9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 10 Sep 2018 16:30:18 +0000 Subject: Vendor import of Unbound 1.7.2. --- util/net_help.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'util/net_help.h') diff --git a/util/net_help.h b/util/net_help.h index 5e0d3a62936e2..de2e1accfd403 100644 --- a/util/net_help.h +++ b/util/net_help.h @@ -73,10 +73,10 @@ struct regional; /** set RCODE bits in uint16 flags */ #define FLAGS_SET_RCODE(f, r) (f = (((f) & 0xfff0) | (r))) -/** timeout in seconds for UDP queries to auth servers. */ -#define UDP_AUTH_QUERY_TIMEOUT 4 -/** timeout in seconds for TCP queries to auth servers. */ -#define TCP_AUTH_QUERY_TIMEOUT 30 +/** timeout in milliseconds for UDP queries to auth servers. */ +#define UDP_AUTH_QUERY_TIMEOUT 3000 +/** timeout in milliseconds for TCP queries to auth servers. */ +#define TCP_AUTH_QUERY_TIMEOUT 3000 /** Advertised version of EDNS capabilities */ #define EDNS_ADVERTISED_VERSION 0 /** Advertised size of EDNS capabilities */ @@ -395,9 +395,11 @@ void* listen_sslctx_create(char* key, char* pem, char* verifypem); * @param key: if nonNULL (also pem nonNULL), the client private key. * @param pem: client public key (or NULL if key is NULL). * @param verifypem: if nonNULL used for verifylocation file. + * @param wincert: add system certificate store to ctx (add to verifypem ca + * certs). * @return SSL_CTX* or NULL on failure (logged). */ -void* connect_sslctx_create(char* key, char* pem, char* verifypem); +void* connect_sslctx_create(char* key, char* pem, char* verifypem, int wincert); /** * accept a new fd and wrap it in a BIO in SSL -- cgit v1.2.3