Skip to content

Commit fa83fd8

Browse files
authored
[Backport release-25.11] openssl_3: 3.0.18 -> 3.0.19 (#484684)
2 parents e5c7ed7 + 621d208 commit fa83fd8

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

pkgs/development/libraries/openssl/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ in
423423
};
424424

425425
openssl_3 = common {
426-
version = "3.0.18";
427-
hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os=";
426+
version = "3.0.19";
427+
hash = "sha256-+lpBQ7iq4YvlPvLzyvKaLgdHQwuLx00y2IM1uUq2MHI=";
428428

429429
patches = [
430430
# Support for NIX_SSL_CERT_FILE, motivation:

pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ index 329ef62..9a8df64 100644
33
--- a/include/internal/cryptlib.h
44
+++ b/include/internal/cryptlib.h
55
@@ -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
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/use-etc-ssl-certs.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ index 329ef62..9a8df64 100644
33
--- a/include/internal/cryptlib.h
44
+++ b/include/internal/cryptlib.h
55
@@ -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
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

0 commit comments

Comments
 (0)