git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #54438: openssl_1_1: use the same default CA path as 1.0.*
commit7e6662a275c0bc1549ca849d865e88ce7dd8473c authorVladimír Čunát <vcunat@gmail.com> dateTue 29 Jan 2019, 13:51 (8 years ago) parenta98cebb6f61d8b
3 files changed+33−1
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch+13 pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch+13 pkgs/development/libraries/openssl/default.nix+7−1
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
2+index 329ef62..9a8df64 100644
3+--- a/include/internal/cryptlib.h
4++++ b/include/internal/cryptlib.h
5+@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
6+ # ifndef OPENSSL_SYS_VMS
7+ # define X509_CERT_AREA OPENSSLDIR
8+ # define X509_CERT_DIR OPENSSLDIR "/certs"
9+-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
10++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
11+ # define X509_PRIVATE_DIR OPENSSLDIR "/private"
12+ # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
13+ # else
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
2+index 329ef62..9a8df64 100644
3+--- a/include/internal/cryptlib.h
4++++ b/include/internal/cryptlib.h
5+@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
6+ # ifndef OPENSSL_SYS_VMS
7+ # define X509_CERT_AREA OPENSSLDIR
8+ # define X509_CERT_DIR OPENSSLDIR "/certs"
9+-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
10++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
11+ # define X509_PRIVATE_DIR OPENSSLDIR "/private"
12+ # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
13+ # else
pkgs/development/libraries/openssl/default.nix+7−1
@@ -134,7 +134,13 @@ in {
134134 openssl_1_1 = common {
135135 version = "1.1.1a";
136136 sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w";
137− patches = [ ./1.1/nix-ssl-cert-file.patch ];
137+ patches = [
138+ ./1.1/nix-ssl-cert-file.patch
139+
140+ (if stdenv.hostPlatform.isDarwin
141+ then ./1.1/use-etc-ssl-certs-darwin.patch
142+ else ./1.1/use-etc-ssl-certs.patch)
143+ ];
138144 withDocs = true;
139145 };
140146