openssl_3: 3.0.18 -> 3.0.19 (#484641)
This commit is contained in:
@@ -429,8 +429,8 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
openssl_3 = common {
|
openssl_3 = common {
|
||||||
version = "3.0.18";
|
version = "3.0.19";
|
||||||
hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os=";
|
hash = "sha256-+lpBQ7iq4YvlPvLzyvKaLgdHQwuLx00y2IM1uUq2MHI=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Support for NIX_SSL_CERT_FILE, motivation:
|
# Support for NIX_SSL_CERT_FILE, motivation:
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ index 329ef62..9a8df64 100644
|
|||||||
--- a/include/internal/cryptlib.h
|
--- a/include/internal/cryptlib.h
|
||||||
+++ b/include/internal/cryptlib.h
|
+++ b/include/internal/cryptlib.h
|
||||||
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
|
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
|
||||||
# ifndef OPENSSL_SYS_VMS
|
#ifndef OPENSSL_SYS_VMS
|
||||||
# define X509_CERT_AREA OPENSSLDIR
|
#define X509_CERT_AREA OPENSSLDIR
|
||||||
# define X509_CERT_DIR OPENSSLDIR "/certs"
|
#define X509_CERT_DIR OPENSSLDIR "/certs"
|
||||||
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
-#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
||||||
+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
+#define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
||||||
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
#define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
||||||
# define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
|
#define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
|
||||||
# else
|
#else
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ index 329ef62..9a8df64 100644
|
|||||||
--- a/include/internal/cryptlib.h
|
--- a/include/internal/cryptlib.h
|
||||||
+++ b/include/internal/cryptlib.h
|
+++ b/include/internal/cryptlib.h
|
||||||
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
|
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
|
||||||
# ifndef OPENSSL_SYS_VMS
|
#ifndef OPENSSL_SYS_VMS
|
||||||
# define X509_CERT_AREA OPENSSLDIR
|
#define X509_CERT_AREA OPENSSLDIR
|
||||||
# define X509_CERT_DIR OPENSSLDIR "/certs"
|
#define X509_CERT_DIR OPENSSLDIR "/certs"
|
||||||
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
-#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
||||||
+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
|
+#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
|
||||||
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
#define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
||||||
# define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
|
#define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
|
||||||
# else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user