summaryrefslogtreecommitdiffstats
path: root/lib/libfetch/common.c
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2016-01-22 20:41:56 +0000
committerdim <dim@FreeBSD.org>2016-01-22 20:41:56 +0000
commit7cf07624a0c8bc9de65a351f13206cea487afb48 (patch)
tree10bd7a9c1abe1f278df85958745a2a09074c1dda /lib/libfetch/common.c
parentf011e361d3e821edf47ec30d69116ed25a05b696 (diff)
parent66dd616ca8c4d3779be38f549e7e793674dbfd03 (diff)
downloadFreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.zip
FreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.tar.gz
Merge ^/head r294169 through r294598.
Diffstat (limited to 'lib/libfetch/common.c')
-rw-r--r--lib/libfetch/common.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index ae8b79d..76dc4f9 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -705,7 +705,8 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
if (ca_cert_file == NULL &&
access(LOCAL_CERT_FILE, R_OK) == 0)
ca_cert_file = LOCAL_CERT_FILE;
- if (ca_cert_file == NULL)
+ if (ca_cert_file == NULL &&
+ access(BASE_CERT_FILE, R_OK) == 0)
ca_cert_file = BASE_CERT_FILE;
ca_cert_path = getenv("SSL_CA_CERT_PATH");
if (verbose) {
@@ -716,11 +717,17 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
if (ca_cert_path != NULL)
fetch_info("Using CA cert path: %s",
ca_cert_path);
+ if (ca_cert_file == NULL && ca_cert_path == NULL)
+ fetch_info("Using OpenSSL default "
+ "CA cert file and path");
}
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER,
fetch_ssl_cb_verify_crt);
- SSL_CTX_load_verify_locations(ctx, ca_cert_file,
- ca_cert_path);
+ if (ca_cert_file != NULL || ca_cert_path != NULL)
+ SSL_CTX_load_verify_locations(ctx, ca_cert_file,
+ ca_cert_path);
+ else
+ SSL_CTX_set_default_verify_paths(ctx);
if ((crl_file = getenv("SSL_CRL_FILE")) != NULL) {
if (verbose)
fetch_info("Using CRL file: %s", crl_file);
OpenPOWER on IntegriCloud