Merge branch 'dev-1.1'

[packages/openssl.git] / openssl-ca-certificates.patch

diff --git a/openssl-ca-certificates.patch b/openssl-ca-certificates.patch
index 0221ac2b24fb216127fbf848597b76636ce82d27..1afdbfbda0cd7ca9c6c6f49b5ad07be0a9668aaa 100644 (file)
--- a/openssl-ca-certificates.patch
+++ b/openssl-ca-certificates.patch
@@ -1,12 +1,11 @@
-diff -ruN openssl-1.0.2.orig/crypto/cryptlib.h openssl-1.0.2/crypto/cryptlib.h
---- openssl-1.0.2.orig/crypto/cryptlib.h       2015-01-22 15:58:32.000000000 +0100
-+++ openssl-1.0.2/crypto/cryptlib.h    2015-01-27 15:48:31.239123780 +0100
-@@ -82,7 +82,7 @@
+--- openssl-1.1.1/include/internal/cryptlib.h~ 2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/include/internal/cryptlib.h  2018-09-11 22:14:32.008012409 +0200
+@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
  # ifndef OPENSSL_SYS_VMS
  #  define X509_CERT_AREA          OPENSSLDIR
  #  define X509_CERT_DIR           OPENSSLDIR "/certs"
 -#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
 +#  define X509_CERT_FILE          "/etc/pki/tls/certs/ca-bundle.crt"
  #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ #  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"
  # else
- #  define X509_CERT_AREA          "SSLROOT:[000000]"