From 1b0822c7f4d87335d1854c066d1eb8e8b5b2334b Mon Sep 17 00:00:00 2001 From: idriskalp Date: Mon, 23 Dec 2019 04:28:25 +0300 Subject: [PATCH] openssl 1.1.1d --- system/base/openssl/actions.py | 12 +- system/base/openssl/comar/package.py | 0 system/base/openssl/files/ca-dir.patch | 31 +++++ .../files/openssl-1.0.0-beta4-ca-dir.patch | 0 .../files/openssl-1.0.2a-x32-asm.patch | 43 +++++++ ...ssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch | 30 +++++ ...ential-memleaks-w-BN_to_ASN1_INTEGER.patch | 107 ++++++++++++++++++ .../files/openssl-1.1.1d-fix-zlib.patch | 52 +++++++++ ...hed-AES-CBC-HMAC-SHA-implementations.patch | 62 ++++++++++ .../openssl/files/openssl-alpha-ccc.patch | 0 .../base/openssl/files/openssl-asflag.patch | 0 system/base/openssl/files/openssl-c_rehash.sh | 0 .../files/openssl-ca-certificates.patch | 0 system/base/openssl/files/openssl-find.patch | 0 .../base/openssl/files/openssl-include.patch | 0 .../base/openssl/files/openssl-ldflags.patch | 0 .../openssl/files/openssl-man-namespace.patch | 0 .../base/openssl/files/openssl-optflags.patch | 0 .../openssl/files/openssl-ssl-certificate.sh | 0 .../openssl/files/openssl_fix_for_x32.patch | 0 system/base/openssl/files/pic.patch | 0 system/base/openssl/pspec.xml | 31 +++-- system/base/openssl/translations.xml | 0 23 files changed, 353 insertions(+), 15 deletions(-) mode change 100644 => 100755 system/base/openssl/actions.py mode change 100644 => 100755 system/base/openssl/comar/package.py create mode 100644 system/base/openssl/files/ca-dir.patch mode change 100644 => 100755 system/base/openssl/files/openssl-1.0.0-beta4-ca-dir.patch create mode 100644 system/base/openssl/files/openssl-1.0.2a-x32-asm.patch create mode 100644 system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch create mode 100644 system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch create mode 100644 system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch create mode 100644 system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch mode change 100644 => 100755 system/base/openssl/files/openssl-alpha-ccc.patch mode change 100644 => 100755 system/base/openssl/files/openssl-asflag.patch mode change 100644 => 100755 system/base/openssl/files/openssl-c_rehash.sh mode change 100644 => 100755 system/base/openssl/files/openssl-ca-certificates.patch mode change 100644 => 100755 system/base/openssl/files/openssl-find.patch mode change 100644 => 100755 system/base/openssl/files/openssl-include.patch mode change 100644 => 100755 system/base/openssl/files/openssl-ldflags.patch mode change 100644 => 100755 system/base/openssl/files/openssl-man-namespace.patch mode change 100644 => 100755 system/base/openssl/files/openssl-optflags.patch mode change 100644 => 100755 system/base/openssl/files/openssl-ssl-certificate.sh mode change 100644 => 100755 system/base/openssl/files/openssl_fix_for_x32.patch mode change 100644 => 100755 system/base/openssl/files/pic.patch mode change 100644 => 100755 system/base/openssl/pspec.xml mode change 100644 => 100755 system/base/openssl/translations.xml diff --git a/system/base/openssl/actions.py b/system/base/openssl/actions.py old mode 100644 new mode 100755 index c5d560d4..52eb478d --- a/system/base/openssl/actions.py +++ b/system/base/openssl/actions.py @@ -17,7 +17,7 @@ def setup(): --openssldir=/etc/ssl \ shared -Wa,--noexecstack \ zlib enable-camellia enable-idea \ - enable-seed enable-tlsext enable-rfc3779 enable-rc5 \ + enable-seed enable-rfc3779 enable-rc5 \ enable-cms enable-md2 enable-mdc2 threads" if get.buildTYPE() == "_emul32": @@ -41,7 +41,7 @@ def setup(): def build(): autotools.make("depend") autotools.make("-j1") - autotools.make("rehash") + #autotools.make("rehash") def check(): #Revert ca-dir patch not to fail test @@ -56,12 +56,12 @@ def check(): #shelltools.system("patch -p1 < openssl-1.0.0-beta4-ca-dir.patch") def install(): - autotools.rawInstall("INSTALL_PREFIX=%s MANDIR=/usr/share/man" % get.installDIR()) + autotools.rawInstall("DESTDIR=%s MANDIR=/usr/share/man" % get.installDIR()) # Rename conflicting manpages pisitools.rename("/usr/share/man/man1/passwd.1", "ssl-passwd.1") - pisitools.rename("/usr/share/man/man3/rand.3", "ssl-rand.3") - pisitools.rename("/usr/share/man/man3/err.3", "ssl-err.3") + #pisitools.rename("/usr/share/man/man3/rand.3", "ssl-rand.3") + #pisitools.rename("/usr/share/man/man3/err.3", "ssl-err.3") if get.buildTYPE() == "_emul32": #from distutils.dir_util import copy_tree @@ -74,7 +74,7 @@ def install(): # Move engines to /usr/lib/openssl/engines pisitools.dodir("/usr/lib/openssl") - pisitools.domove("/usr/lib/engines", "/usr/lib/openssl") + #pisitools.domove("/usr/lib/engines", "/usr/lib/openssl") # Certificate stuff pisitools.dobin("tools/c_rehash") diff --git a/system/base/openssl/comar/package.py b/system/base/openssl/comar/package.py old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/ca-dir.patch b/system/base/openssl/files/ca-dir.patch new file mode 100644 index 00000000..a1402435 --- /dev/null +++ b/system/base/openssl/files/ca-dir.patch @@ -0,0 +1,31 @@ +--- apps/CA.pl.in 2018-09-11 14:48:19.000000000 +0200 ++++ apps/CA.pl.in 2018-09-11 16:16:32.125629435 +0200 +@@ -33,7 +33,7 @@ + my $PKCS12 = "$openssl pkcs12"; + + # default openssl.cnf file has setup as per the following +-my $CATOP = "./demoCA"; ++my $CATOP = "/etc/ssl"; + my $CAKEY = "cakey.pem"; + my $CAREQ = "careq.pem"; + my $CACERT = "cacert.pem"; +--- apps/openssl.cnf 2018-09-11 14:48:20.000000000 +0200 ++++ apps/openssl.cnf 2018-09-11 16:16:32.125629435 +0200 +@@ -43,7 +43,7 @@ + #################################################################### + [ CA_default ] + +-dir = ./demoCA # Where everything is kept ++dir = /etc/ssl # Where everything is kept + certs = $dir/certs # Where the issued certs are kept + crl_dir = $dir/crl # Where the issued crl are kept + database = $dir/index.txt # database index file. +@@ -327,7 +327,7 @@ + [ tsa_config1 ] + + # These are used by the TSA reply generation only. +-dir = ./demoCA # TSA root directory ++dir = /etc/ssl # TSA root directory + serial = $dir/tsaserial # The current serial number (mandatory) + crypto_device = builtin # OpenSSL engine to use for signing + signer_cert = $dir/tsacert.pem # The TSA signing certificate diff --git a/system/base/openssl/files/openssl-1.0.0-beta4-ca-dir.patch b/system/base/openssl/files/openssl-1.0.0-beta4-ca-dir.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-1.0.2a-x32-asm.patch b/system/base/openssl/files/openssl-1.0.2a-x32-asm.patch new file mode 100644 index 00000000..3a005c9b --- /dev/null +++ b/system/base/openssl/files/openssl-1.0.2a-x32-asm.patch @@ -0,0 +1,43 @@ +https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest + +From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sat, 21 Mar 2015 06:01:25 -0400 +Subject: [PATCH] crypto: use bigint in x86-64 perl + +When building on x32 systems where the default type is 32bit, make sure +we can transparently represent 64bit integers. Otherwise we end up with +build errors like: +/usr/bin/perl asm/ghash-x86_64.pl elf > ghash-x86_64.s +Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, <> line 890. +... +ghash-x86_64.s: Assembler messages: +ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression + +We don't enable this globally as there are some cases where we'd get +32bit values interpreted as unsigned when we need them as signed. + +Reported-by: Bertrand Jacquin +URL: https://bugs.gentoo.org/542618 +--- + crypto/perlasm/x86_64-xlate.pl | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +index aae8288..0bf9774 100755 +--- a/crypto/perlasm/x86_64-xlate.pl ++++ b/crypto/perlasm/x86_64-xlate.pl +@@ -195,6 +195,10 @@ my %globals; + sub out { + my $self = shift; + ++ # When building on x32 ABIs, the expanded hex value might be too ++ # big to fit into 32bits. Enable transparent 64bit support here ++ # so we can safely print it out. ++ use bigint; + if ($gas) { + # Solaris /usr/ccs/bin/as can't handle multiplications + # in $self->{value} +-- +2.3.3 + diff --git a/system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch new file mode 100644 index 00000000..35a435df --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch @@ -0,0 +1,30 @@ +From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001 +From: Nicola Tuveri +Date: Thu, 12 Sep 2019 01:57:47 +0300 +Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0) + +I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and +inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this +fixes it. +--- + crypto/ec/ec_curve.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c +index 2d28d7f70bb..6a58b3a23e0 100644 +--- a/crypto/ec/ec_curve.c ++++ b/crypto/ec/ec_curve.c +@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group, + + #ifndef OPENSSL_NO_EC2M + if (field_nid == NID_X9_62_characteristic_two_field) { +- return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); ++ return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); + } else + #endif /* !def(OPENSSL_NO_EC2M) */ + if (field_nid == NID_X9_62_prime_field) { +- return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); ++ return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); + } else { + /* this should never happen */ + return 0; diff --git a/system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch b/system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch new file mode 100644 index 00000000..1f195d03 --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch @@ -0,0 +1,107 @@ +From 515c728dbaa92211d2eafb0041ab9fcd258fdc41 Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Mon, 9 Sep 2019 19:12:25 +0200 +Subject: [PATCH] Fix potential memory leaks with BN_to_ASN1_INTEGER + +Reviewed-by: Paul Dale +Reviewed-by: Matt Caswell +(Merged from https://github.com/openssl/openssl/pull/9833) + +(cherry picked from commit f28bc7d386b25fb75625d0c62c6b2e6d21de0d09) +--- + crypto/ec/ec_asn1.c | 7 +++++-- + crypto/x509v3/v3_asid.c | 26 ++++++++++++++++++++------ + 2 files changed, 25 insertions(+), 8 deletions(-) + +diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c +index 1ce1181fc10..7cbf8de9813 100644 +--- a/crypto/ec/ec_asn1.c ++++ b/crypto/ec/ec_asn1.c +@@ -446,6 +446,7 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group, + unsigned char *buffer = NULL; + const EC_POINT *point = NULL; + point_conversion_form_t form; ++ ASN1_INTEGER *orig; + + if (params == NULL) { + if ((ret = ECPARAMETERS_new()) == NULL) { +@@ -496,8 +497,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group, + ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB); + goto err; + } +- ret->order = BN_to_ASN1_INTEGER(tmp, ret->order); ++ ret->order = BN_to_ASN1_INTEGER(tmp, orig = ret->order); + if (ret->order == NULL) { ++ ret->order = orig; + ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB); + goto err; + } +@@ -505,8 +507,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group, + /* set the cofactor (optional) */ + tmp = EC_GROUP_get0_cofactor(group); + if (tmp != NULL) { +- ret->cofactor = BN_to_ASN1_INTEGER(tmp, ret->cofactor); ++ ret->cofactor = BN_to_ASN1_INTEGER(tmp, orig = ret->cofactor); + if (ret->cofactor == NULL) { ++ ret->cofactor = orig; + ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB); + goto err; + } +diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c +index 089f2ae29f0..ef2d64826fb 100644 +--- a/crypto/x509v3/v3_asid.c ++++ b/crypto/x509v3/v3_asid.c +@@ -256,6 +256,7 @@ static int extract_min_max(ASIdOrRange *aor, + static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) + { + ASN1_INTEGER *a_max_plus_one = NULL; ++ ASN1_INTEGER *orig; + BIGNUM *bn = NULL; + int i, ret = 0; + +@@ -298,9 +299,15 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice) + */ + if ((bn == NULL && (bn = BN_new()) == NULL) || + ASN1_INTEGER_to_BN(a_max, bn) == NULL || +- !BN_add_word(bn, 1) || +- (a_max_plus_one = +- BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) { ++ !BN_add_word(bn, 1)) { ++ X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL, ++ ERR_R_MALLOC_FAILURE); ++ goto done; ++ } ++ ++ if ((a_max_plus_one = ++ BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) { ++ a_max_plus_one = orig; + X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL, + ERR_R_MALLOC_FAILURE); + goto done; +@@ -351,6 +358,7 @@ int X509v3_asid_is_canonical(ASIdentifiers *asid) + static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice) + { + ASN1_INTEGER *a_max_plus_one = NULL; ++ ASN1_INTEGER *orig; + BIGNUM *bn = NULL; + int i, ret = 0; + +@@ -416,9 +424,15 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice) + */ + if ((bn == NULL && (bn = BN_new()) == NULL) || + ASN1_INTEGER_to_BN(a_max, bn) == NULL || +- !BN_add_word(bn, 1) || +- (a_max_plus_one = +- BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) { ++ !BN_add_word(bn, 1)) { ++ X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, ++ ERR_R_MALLOC_FAILURE); ++ goto done; ++ } ++ ++ if ((a_max_plus_one = ++ BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) { ++ a_max_plus_one = orig; + X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, + ERR_R_MALLOC_FAILURE); + goto done; diff --git a/system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch b/system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch new file mode 100644 index 00000000..5d2f923a --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.1d-fix-zlib.patch @@ -0,0 +1,52 @@ +From 86ed78676c660b553696cc10c682962522dfeb6c Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Thu, 12 Sep 2019 12:27:36 +0200 +Subject: [PATCH] BIO_f_zlib: Properly handle BIO_CTRL_PENDING and + BIO_CTRL_WPENDING calls. + +There can be data to write in output buffer and data to read that were +not yet read in the input stream. + +Fixes #9866 + +Reviewed-by: Richard Levitte +(Merged from https://github.com/openssl/openssl/pull/9877) + +(cherry picked from commit 6beb8b39ba8e4cb005c1fcd2586ba19e17f04b95) +--- + crypto/comp/c_zlib.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c +index d688deee5f2..7c1be358fd7 100644 +--- a/crypto/comp/c_zlib.c ++++ b/crypto/comp/c_zlib.c +@@ -598,6 +598,28 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr) + BIO_copy_next_retry(b); + break; + ++ case BIO_CTRL_WPENDING: ++ if (ctx->obuf == NULL) ++ return 0; ++ ++ if (ctx->odone) { ++ ret = ctx->ocount; ++ } else { ++ ret = ctx->ocount; ++ if (ret == 0) ++ /* Unknown amount pending but we are not finished */ ++ ret = 1; ++ } ++ if (ret == 0) ++ ret = BIO_ctrl(next, cmd, num, ptr); ++ break; ++ ++ case BIO_CTRL_PENDING: ++ ret = ctx->zin.avail_in; ++ if (ret == 0) ++ ret = BIO_ctrl(next, cmd, num, ptr); ++ break; ++ + default: + ret = BIO_ctrl(next, cmd, num, ptr); + break; diff --git a/system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch b/system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch new file mode 100644 index 00000000..dc8fe714 --- /dev/null +++ b/system/base/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch @@ -0,0 +1,62 @@ +From 61cc715240d2d3f9511ca88043a3e9797c11482f Mon Sep 17 00:00:00 2001 +From: Richard Levitte +Date: Thu, 3 Oct 2019 08:28:31 +0200 +Subject: [PATCH] Define AESNI_ASM if AESNI assembler is included, and use it + +Because we have cases where basic assembler support isn't present, but +AESNI asssembler support is, we need a separate macro that indicates +that, and use it. + +Reviewed-by: Tomas Mraz +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/10080) +--- + Configure | 1 + + crypto/evp/e_aes_cbc_hmac_sha1.c | 2 +- + crypto/evp/e_aes_cbc_hmac_sha256.c | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Configure b/Configure +index 811bee81f54..f498ac2f81b 100755 +--- a/Configure ++++ b/Configure +@@ -1376,6 +1376,7 @@ unless ($disabled{asm}) { + } + if ($target{aes_asm_src}) { + push @{$config{lib_defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);; ++ push @{$config{lib_defines}}, "AESNI_ASM" if ($target{aes_asm_src} =~ m/\baesni-/);; + # aes-ctr.fake is not a real file, only indication that assembler + # module implements AES_ctr32_encrypt... + push @{$config{lib_defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//); +diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c +index c9f5969162c..27c36b46e7a 100644 +--- a/crypto/evp/e_aes_cbc_hmac_sha1.c ++++ b/crypto/evp/e_aes_cbc_hmac_sha1.c +@@ -33,7 +33,7 @@ typedef struct { + + #define NO_PAYLOAD_LENGTH ((size_t)-1) + +-#if defined(AES_ASM) && ( \ ++#if defined(AESNI_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) ) + +diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c +index d5178313ae3..cc622b6faa8 100644 +--- a/crypto/evp/e_aes_cbc_hmac_sha256.c ++++ b/crypto/evp/e_aes_cbc_hmac_sha256.c +@@ -34,7 +34,7 @@ typedef struct { + + # define NO_PAYLOAD_LENGTH ((size_t)-1) + +-#if defined(AES_ASM) && ( \ ++#if defined(AESNI_ASM) && ( \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) ) + +@@ -947,4 +947,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void) + { + return NULL; + } +-#endif ++#endif /* AESNI_ASM */ diff --git a/system/base/openssl/files/openssl-alpha-ccc.patch b/system/base/openssl/files/openssl-alpha-ccc.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-asflag.patch b/system/base/openssl/files/openssl-asflag.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-c_rehash.sh b/system/base/openssl/files/openssl-c_rehash.sh old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-ca-certificates.patch b/system/base/openssl/files/openssl-ca-certificates.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-find.patch b/system/base/openssl/files/openssl-find.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-include.patch b/system/base/openssl/files/openssl-include.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-ldflags.patch b/system/base/openssl/files/openssl-ldflags.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-man-namespace.patch b/system/base/openssl/files/openssl-man-namespace.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-optflags.patch b/system/base/openssl/files/openssl-optflags.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl-ssl-certificate.sh b/system/base/openssl/files/openssl-ssl-certificate.sh old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/openssl_fix_for_x32.patch b/system/base/openssl/files/openssl_fix_for_x32.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/files/pic.patch b/system/base/openssl/files/pic.patch old mode 100644 new mode 100755 diff --git a/system/base/openssl/pspec.xml b/system/base/openssl/pspec.xml old mode 100644 new mode 100755 index cf827893..70bba91c --- a/system/base/openssl/pspec.xml +++ b/system/base/openssl/pspec.xml @@ -13,10 +13,10 @@ library Toolkit for SSL v2/v3 and TLS v1 OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. - https://www.openssl.org/source/openssl-1.0.2q.tar.gz + https://www.openssl.org/source/openssl-1.1.1d.tar.gz - openssl-1.0.0-beta4-ca-dir.patch - + + zlib-devel @@ -25,16 +25,22 @@ sed - openssl-alpha-ccc.patch - openssl-optflags.patch - openssl-include.patch - openssl-man-namespace.patch - openssl-asflag.patch + + + + + + + openssl-1.0.2a-x32-asm.patch + + openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch + openssl-1.1.1d-fix-zlib.patch + openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch @@ -92,6 +98,13 @@ + + 2019-12-23 + 1.1.1d + Version bump. + Idris Kalp + idriskalp@gmail.com + 2018-11-28 1.0.2q diff --git a/system/base/openssl/translations.xml b/system/base/openssl/translations.xml old mode 100644 new mode 100755