Hello community, here is the log from the commit of package openssl-1_1 for openSUSE:Factory checked in at 2020-04-02 17:42:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl-1_1 (Old) and /work/SRC/openSUSE:Factory/.openssl-1_1.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssl-1_1" Thu Apr 2 17:42:25 2020 rev:16 rq:790184 version:1.1.1f Changes: -------- --- /work/SRC/openSUSE:Factory/openssl-1_1/openssl-1_1.changes 2020-03-01 21:26:18.388348358 +0100 +++ /work/SRC/openSUSE:Factory/.openssl-1_1.new.3248/openssl-1_1.changes 2020-04-02 17:42:27.029353981 +0200 @@ -1,0 +2,52 @@ +Tue Mar 31 14:05:24 UTC 2020 - Vítězslav Čížek <[email protected]> + +- Update to 1.1.1f + * Revert the unexpected EOF reporting via SSL_ERROR_SSL +- refresh openssl-1.1.0-no-html.patch + +------------------------------------------------------------------- +Fri Mar 20 11:58:08 UTC 2020 - Vítězslav Čížek <[email protected]> + +- Update to 1.1.1e + * Properly detect EOF while reading in libssl. Previously if we hit an EOF + while reading in libssl then we would report an error back to the + application (SSL_ERROR_SYSCALL) but errno would be 0. We now add + an error to the stack (which means we instead return SSL_ERROR_SSL) and + therefore give a hint as to what went wrong. + * Check that ed25519 and ed448 are allowed by the security level. Previously + signature algorithms not using an MD were not being checked that they were + allowed by the security level. + * Fixed SSL_get_servername() behaviour. The behaviour of SSL_get_servername() + was not quite right. The behaviour was not consistent between resumption + and normal handshakes, and also not quite consistent with historical + behaviour. The behaviour in various scenarios has been clarified and + it has been updated to make it match historical behaviour as closely as + possible. + * Corrected the documentation of the return values from the EVP_DigestSign* + set of functions. The documentation mentioned negative values for some + errors, but this was never the case, so the mention of negative values + was removed. + * Added a new method to gather entropy on VMS, based on SYS$GET_ENTROPY. + The presence of this system service is determined at run-time. + * Added newline escaping functionality to a filename when using openssl dgst. + This output format is to replicate the output format found in the '*sum' + checksum programs. This aims to preserve backward compatibility. + * Print all values for a PKCS#12 attribute with 'openssl pkcs12', not just + the first value. +- Update bunch of patches as the internal crypto headers got reorganized +- drop openssl-1_1-CVE-2019-1551.patch (upstream) + +------------------------------------------------------------------- +Fri Mar 20 10:22:27 UTC 2020 - Vítězslav Čížek <[email protected]> + +- openssl dgst: default to SHA256 only when called without a digest, + not when it couldn't be found (bsc#1166189) + * add openssl-unknown_dgst.patch + +------------------------------------------------------------------- +Wed Mar 4 08:23:23 UTC 2020 - Vítězslav Čížek <[email protected]> + +- Limit the DRBG selftests to not deplete entropy (bsc#1165274) + * update openssl-fips_selftest_upstream_drbg.patch + +------------------------------------------------------------------- Old: ---- openssl-1.1.1d.tar.gz openssl-1.1.1d.tar.gz.asc openssl-1_1-CVE-2019-1551.patch New: ---- openssl-1.1.1f.tar.gz openssl-1.1.1f.tar.gz.asc openssl-unknown_dgst.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl-1_1.spec ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.101355585 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.101355585 +0200 @@ -21,7 +21,7 @@ %define _rname openssl Name: openssl-1_1 # Don't forget to update the version in the "openssl" package! -Version: 1.1.1d +Version: 1.1.1f Release: 0 Summary: Secure Sockets and Transport Layer Security License: OpenSSL @@ -50,9 +50,6 @@ Patch11: 0004-s390x-assembly-pack-fix-formal-interface-bug-in-chac.patch Patch12: 0005-s390x-assembly-pack-import-chacha-from-cryptogams-re.patch Patch13: 0006-s390x-assembly-pack-import-poly-from-cryptogams-repo.patch -# OpenSSL Security Advisory [6 December 2019] bsc#1158809 CVE-2019-1551 -# PATCH-FIX-UPSTREAM Integer overflow in RSAZ modular exponentiation on x86_64 -Patch15: openssl-1_1-CVE-2019-1551.patch # PATCH-FIX-UPSTREAM bsc#1152695 jsc#SLE-7861 Support for CPACF enhancements - part 1 (crypto) Patch16: openssl-s390x-assembly-pack-add-OPENSSL_s390xcap-environment.patch Patch17: openssl-s390x-assembly-pack-add-support-for-pcc-and-kma-inst.patch @@ -85,6 +82,7 @@ Patch44: openssl-fips_fix_selftests_return_value.patch Patch45: openssl-fips-add-SHA3-selftest.patch Patch46: openssl-fips_selftest_upstream_drbg.patch +Patch47: openssl-unknown_dgst.patch # PATCH-FIX-UPSTREAM jsc#SLE-7403 Support for CPACF enhancements - part 2 (crypto) Patch50: openssl-s390x-assembly-pack-accelerate-X25519-X448-Ed25519-and-Ed448.patch Patch51: openssl-s390x-fix-x448-and-x448-test-vector-ctime-for-x25519-and-x448.patch ++++++ 0002-crypto-chacha-asm-chacha-s390x.pl-add-vx-code-path.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.153355625 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.157355629 +0200 @@ -13,17 +13,10 @@ crypto/chacha/build.info | 1 + 2 files changed, 558 insertions(+), 259 deletions(-) -Index: openssl-1.1.1c/crypto/chacha/asm/chacha-s390x.pl +Index: openssl-1.1.1e/crypto/chacha/asm/chacha-s390x.pl =================================================================== ---- openssl-1.1.1c.orig/crypto/chacha/asm/chacha-s390x.pl 2019-06-06 12:15:57.271195550 +0200 -+++ openssl-1.1.1c/crypto/chacha/asm/chacha-s390x.pl 2019-06-06 12:16:43.787489780 +0200 -@@ -1,5 +1,5 @@ - #! /usr/bin/env perl --# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. -+# Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. - # - # Licensed under the OpenSSL license (the "License"). You may not use - # this file except in compliance with the License. You can obtain a copy +--- openssl-1.1.1e.orig/crypto/chacha/asm/chacha-s390x.pl 2020-03-19 11:43:25.650616856 +0100 ++++ openssl-1.1.1e/crypto/chacha/asm/chacha-s390x.pl 2020-03-19 11:43:40.614692484 +0100 @@ -20,41 +20,46 @@ # # 3 times faster than compiler-generated code. @@ -859,7 +852,7 @@ +SIZE ("_s390x_chacha_novx",".-_s390x_chacha_novx"); +} } --close STDOUT; +-close STDOUT or die "error closing STDOUT: $!"; +################ + +ALIGN (64); ++++++ 0003-crypto-poly1305-asm-poly1305-s390x.pl-add-vx-code-pa.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.165355635 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.165355635 +0200 @@ -942,7 +942,7 @@ -$code =~ s/\b(srlg\s+)(%r[0-9]+\s*,)\s*([0-9]+)/$1$2$2$3/gm; - -print $code; --close STDOUT; +-close STDOUT or die "error closing STDOUT: $!"; +GLOBL ("poly1305_emit"); +TYPE ("poly1305_emit","\@function"); +ALIGN (16); ++++++ openssl-1.1.0-no-html.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.201355662 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.201355662 +0200 @@ -1,7 +1,7 @@ -Index: openssl-1.1.1d/Configurations/unix-Makefile.tmpl +Index: openssl-1.1.1f/Configurations/unix-Makefile.tmpl =================================================================== ---- openssl-1.1.1d.orig/Configurations/unix-Makefile.tmpl 2019-09-11 15:38:17.788265421 +0200 -+++ openssl-1.1.1d/Configurations/unix-Makefile.tmpl 2019-09-11 15:38:35.640368636 +0200 +--- openssl-1.1.1f.orig/Configurations/unix-Makefile.tmpl 2020-03-31 16:07:11.764502217 +0200 ++++ openssl-1.1.1f/Configurations/unix-Makefile.tmpl 2020-03-31 16:07:45.036664229 +0200 @@ -544,7 +544,7 @@ install_sw: install_dev install_engines uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev @@ -10,4 +10,4 @@ +install_docs: install_man_docs uninstall_docs: uninstall_man_docs uninstall_html_docs - $(RM) -r $(DESTDIR)$(DOCDIR) + $(RM) -r "$(DESTDIR)$(DOCDIR)" ++++++ openssl-1.1.1-evp-kdf.patch ++++++ ++++ 688 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openssl-1_1/openssl-1.1.1-evp-kdf.patch ++++ and /work/SRC/openSUSE:Factory/.openssl-1_1.new.3248/openssl-1.1.1-evp-kdf.patch ++++++ openssl-1.1.1-fips-crng-test.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.225355681 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.225355681 +0200 @@ -1,7 +1,7 @@ -Index: openssl-1.1.1d/crypto/include/internal/rand_int.h +Index: openssl-1.1.1d/include/crypto/rand.h =================================================================== ---- openssl-1.1.1d.orig/crypto/include/internal/rand_int.h 2020-01-23 13:45:11.368633835 +0100 -+++ openssl-1.1.1d/crypto/include/internal/rand_int.h 2020-01-23 13:45:11.384633930 +0100 +--- openssl-1.1.1d.orig/include/crypto/rand.h 2020-01-23 13:45:11.368633835 +0100 ++++ openssl-1.1.1d/include/crypto/rand.h 2020-01-23 13:45:11.384633930 +0100 @@ -49,6 +49,14 @@ size_t rand_drbg_get_additional_data(RAN void rand_drbg_cleanup_additional_data(RAND_POOL *pool, unsigned char *out); @@ -75,9 +75,9 @@ + +#include <string.h> +#include <openssl/evp.h> -+#include "internal/rand_int.h" ++#include "crypto/rand.h" +#include "internal/thread_once.h" -+#include "rand_lcl.h" ++#include "rand_local.h" + +static RAND_POOL *crngt_pool; +static unsigned char crngt_prev[EVP_MAX_MD_SIZE]; @@ -177,10 +177,10 @@ +{ + OPENSSL_secure_clear_free(out, outlen); +} -Index: openssl-1.1.1d/crypto/rand/rand_lcl.h +Index: openssl-1.1.1d/crypto/rand/rand_local.h =================================================================== ---- openssl-1.1.1d.orig/crypto/rand/rand_lcl.h 2019-09-10 15:13:07.000000000 +0200 -+++ openssl-1.1.1d/crypto/rand/rand_lcl.h 2020-01-23 13:45:11.384633930 +0100 +--- openssl-1.1.1d.orig/crypto/rand/rand_local.h 2019-09-10 15:13:07.000000000 +0200 ++++ openssl-1.1.1d/crypto/rand/rand_local.h 2020-01-23 13:45:11.384633930 +0100 @@ -33,7 +33,15 @@ # define MASTER_RESEED_TIME_INTERVAL (60*60) /* 1 hour */ # define SLAVE_RESEED_TIME_INTERVAL (7*60) /* 7 minutes */ ++++++ openssl-1.1.1-fips-post-rand.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.233355687 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.233355687 +0200 @@ -1,12 +1,12 @@ -Index: openssl-1.1.1d/crypto/fips/fips.c +Index: openssl-1.1.1e/crypto/fips/fips.c =================================================================== ---- openssl-1.1.1d.orig/crypto/fips/fips.c 2020-01-23 13:45:11.232633025 +0100 -+++ openssl-1.1.1d/crypto/fips/fips.c 2020-01-23 13:45:48.216852822 +0100 +--- openssl-1.1.1e.orig/crypto/fips/fips.c 2020-03-20 14:08:12.235758574 +0100 ++++ openssl-1.1.1e/crypto/fips/fips.c 2020-03-20 14:08:13.787766679 +0100 @@ -68,6 +68,7 @@ # include <openssl/fips.h> # include "internal/thread_once.h" -+# include "internal/rand_int.h" ++# include "crypto/rand.h" # ifndef PATH_MAX # define PATH_MAX 1024 @@ -52,10 +52,10 @@ ret = 1; goto end; } -Index: openssl-1.1.1d/crypto/include/internal/fips_int.h +Index: openssl-1.1.1e/include/crypto/fips_int.h =================================================================== ---- openssl-1.1.1d.orig/crypto/include/internal/fips_int.h 2020-01-23 13:45:11.336633643 +0100 -+++ openssl-1.1.1d/crypto/include/internal/fips_int.h 2020-01-23 13:45:11.368633835 +0100 +--- openssl-1.1.1e.orig/include/crypto/fips_int.h 2020-03-20 14:08:12.239758595 +0100 ++++ openssl-1.1.1e/include/crypto/fips_int.h 2020-03-20 14:08:13.787766679 +0100 @@ -77,6 +77,8 @@ int FIPS_selftest_hmac(void); int FIPS_selftest_drbg(void); int FIPS_selftest_cmac(void); @@ -65,10 +65,10 @@ int fips_pkey_signature_test(EVP_PKEY *pkey, const unsigned char *tbs, int tbslen, const unsigned char *kat, -Index: openssl-1.1.1d/crypto/include/internal/rand_int.h +Index: openssl-1.1.1e/include/crypto/rand.h =================================================================== ---- openssl-1.1.1d.orig/crypto/include/internal/rand_int.h 2019-09-10 15:13:07.000000000 +0200 -+++ openssl-1.1.1d/crypto/include/internal/rand_int.h 2020-01-23 13:45:53.964886989 +0100 +--- openssl-1.1.1e.orig/include/crypto/rand.h 2020-03-20 14:08:12.239758595 +0100 ++++ openssl-1.1.1e/include/crypto/rand.h 2020-03-20 14:08:13.791766699 +0100 @@ -24,6 +24,7 @@ typedef struct rand_pool_st RAND_POOL; @@ -77,10 +77,10 @@ void rand_drbg_cleanup_int(void); void drbg_delete_thread_state(void); -Index: openssl-1.1.1d/crypto/rand/drbg_lib.c +Index: openssl-1.1.1e/crypto/rand/drbg_lib.c =================================================================== ---- openssl-1.1.1d.orig/crypto/rand/drbg_lib.c 2019-09-10 15:13:07.000000000 +0200 -+++ openssl-1.1.1d/crypto/rand/drbg_lib.c 2020-01-23 13:45:53.964886989 +0100 +--- openssl-1.1.1e.orig/crypto/rand/drbg_lib.c 2020-03-20 14:08:12.239758595 +0100 ++++ openssl-1.1.1e/crypto/rand/drbg_lib.c 2020-03-20 14:08:13.791766699 +0100 @@ -1009,6 +1009,20 @@ size_t rand_drbg_seedlen(RAND_DRBG *drbg return min_entropy > min_entropylen ? min_entropy : min_entropylen; } @@ -102,15 +102,15 @@ /* Implements the default OpenSSL RAND_add() method */ static int drbg_add(const void *buf, int num, double randomness) { -Index: openssl-1.1.1d/crypto/rand/rand_unix.c +Index: openssl-1.1.1e/crypto/rand/rand_unix.c =================================================================== ---- openssl-1.1.1d.orig/crypto/rand/rand_unix.c 2019-09-10 15:13:07.000000000 +0200 -+++ openssl-1.1.1d/crypto/rand/rand_unix.c 2020-01-23 13:45:11.368633835 +0100 +--- openssl-1.1.1e.orig/crypto/rand/rand_unix.c 2020-03-20 14:08:12.239758595 +0100 ++++ openssl-1.1.1e/crypto/rand/rand_unix.c 2020-03-20 14:08:41.763912735 +0100 @@ -17,10 +17,12 @@ #include <openssl/crypto.h> - #include "rand_lcl.h" - #include "internal/rand_int.h" -+#include "internal/fips_int.h" + #include "rand_local.h" + #include "crypto/rand.h" ++#include "crypto/fips_int.h" #include <stdio.h> #include "internal/dso.h" #ifdef __linux @@ -119,7 +119,7 @@ # ifdef DEVRANDOM_WAIT # include <sys/shm.h> # include <sys/utsname.h> -@@ -295,7 +297,7 @@ static ssize_t sysctl_random(char *buf, +@@ -342,7 +344,7 @@ static ssize_t sysctl_random(char *buf, * syscall_random(): Try to get random data using a system call * returns the number of bytes returned in buf, or < 0 on error. */ @@ -128,7 +128,7 @@ { /* * Note: 'buflen' equals the size of the buffer which is used by the -@@ -317,6 +319,7 @@ static ssize_t syscall_random(void *buf, +@@ -364,6 +366,7 @@ static ssize_t syscall_random(void *buf, * - Linux since 3.17 with glibc 2.25 * - FreeBSD since 12.0 (1200061) */ @@ -136,7 +136,7 @@ # if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux) extern int getentropy(void *buffer, size_t length) __attribute__((weak)); -@@ -338,10 +341,10 @@ static ssize_t syscall_random(void *buf, +@@ -385,10 +388,10 @@ static ssize_t syscall_random(void *buf, if (p_getentropy.p != NULL) return p_getentropy.f(buf, buflen) == 0 ? (ssize_t)buflen : -1; # endif @@ -150,7 +150,7 @@ # elif (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND) return sysctl_random(buf, buflen); # else -@@ -576,6 +579,9 @@ size_t rand_pool_acquire_entropy(RAND_PO +@@ -623,6 +626,9 @@ size_t rand_pool_acquire_entropy(RAND_PO size_t entropy_available; # if defined(OPENSSL_RAND_SEED_GETRANDOM) @@ -160,7 +160,7 @@ { size_t bytes_needed; unsigned char *buffer; -@@ -586,7 +592,7 @@ size_t rand_pool_acquire_entropy(RAND_PO +@@ -633,7 +639,7 @@ size_t rand_pool_acquire_entropy(RAND_PO bytes_needed = rand_pool_bytes_needed(pool, 1 /*entropy_factor*/); while (bytes_needed != 0 && attempts-- > 0) { buffer = rand_pool_add_begin(pool, bytes_needed); @@ -169,7 +169,7 @@ if (bytes > 0) { rand_pool_add_end(pool, bytes, 8 * bytes); bytes_needed -= bytes; -@@ -621,8 +627,10 @@ size_t rand_pool_acquire_entropy(RAND_PO +@@ -668,8 +674,10 @@ size_t rand_pool_acquire_entropy(RAND_PO int attempts = 3; const int fd = get_random_device(i); @@ -181,7 +181,7 @@ while (bytes_needed != 0 && attempts-- > 0) { buffer = rand_pool_add_begin(pool, bytes_needed); -@@ -685,7 +693,9 @@ size_t rand_pool_acquire_entropy(RAND_PO +@@ -732,7 +740,9 @@ size_t rand_pool_acquire_entropy(RAND_PO return entropy_available; } # endif ++++++ openssl-1.1.1-fips.patch ++++++ ++++ 1612 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openssl-1_1/openssl-1.1.1-fips.patch ++++ and /work/SRC/openSUSE:Factory/.openssl-1_1.new.3248/openssl-1.1.1-fips.patch ++++++ openssl-1.1.1-ssh-kdf.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.253355703 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.257355705 +0200 @@ -51,10 +51,10 @@ }; DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_KDF_METHOD *, const EVP_KDF_METHOD *, -Index: openssl-1.1.1d/crypto/include/internal/evp_int.h +Index: openssl-1.1.1d/include/crypto/evp.h =================================================================== ---- openssl-1.1.1d.orig/crypto/include/internal/evp_int.h 2020-01-23 13:45:11.468634429 +0100 -+++ openssl-1.1.1d/crypto/include/internal/evp_int.h 2020-01-23 13:45:11.488634548 +0100 +--- openssl-1.1.1d.orig/include/crypto/evp.h 2020-01-23 13:45:11.468634429 +0100 ++++ openssl-1.1.1d/include/crypto/evp.h 2020-01-23 13:45:11.488634548 +0100 @@ -129,6 +129,7 @@ extern const EVP_KDF_METHOD pbkdf2_kdf_m extern const EVP_KDF_METHOD scrypt_kdf_meth; extern const EVP_KDF_METHOD tls1_prf_kdf_meth; @@ -118,7 +118,7 @@ +#include <openssl/evp.h> +#include <openssl/kdf.h> +#include "internal/cryptlib.h" -+#include "internal/evp_int.h" ++#include "crypto/evp.h" +#include "kdf_local.h" + +/* See RFC 4253, Section 7.2 */ ++++++ openssl-1.1.1d.tar.gz -> openssl-1.1.1f.tar.gz ++++++ /work/SRC/openSUSE:Factory/openssl-1_1/openssl-1.1.1d.tar.gz /work/SRC/openSUSE:Factory/.openssl-1_1.new.3248/openssl-1.1.1f.tar.gz differ: char 5, line 1 ++++++ openssl-Enable-curve-spefific-ECDSA-implementations-via-EC_M.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.289355730 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.289355730 +0200 @@ -13,7 +13,7 @@ (Merged from https://github.com/openssl/openssl/pull/9348) --- crypto/ec/ec2_smpl.c | 3 + - crypto/ec/ec_lcl.h | 15 +++++ + crypto/ec/ec_local.h | 15 +++++ crypto/ec/ecdsa_ossl.c | 107 ++++++++++++++++++++++++------------ crypto/ec/ecp_mont.c | 3 + crypto/ec/ecp_nist.c | 3 + @@ -27,10 +27,10 @@ include/openssl/ecerr.h | 1 + 13 files changed, 119 insertions(+), 36 deletions(-) -Index: openssl-1.1.1d/crypto/ec/ec2_smpl.c +Index: openssl-1.1.1e/crypto/ec/ec2_smpl.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ec2_smpl.c -+++ openssl-1.1.1d/crypto/ec/ec2_smpl.c +--- openssl-1.1.1e.orig/crypto/ec/ec2_smpl.c 2020-03-20 13:03:13.823258089 +0100 ++++ openssl-1.1.1e/crypto/ec/ec2_smpl.c 2020-03-20 13:03:17.247276054 +0100 @@ -956,6 +956,9 @@ const EC_METHOD *EC_GF2m_simple_method(v 0, /* keycopy */ 0, /* keyfinish */ @@ -41,10 +41,10 @@ 0, /* field_inverse_mod_ord */ 0, /* blind_coordinates */ ec_GF2m_simple_ladder_pre, -Index: openssl-1.1.1d/crypto/ec/ec_lcl.h +Index: openssl-1.1.1e/crypto/ec/ec_local.h =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ec_lcl.h -+++ openssl-1.1.1d/crypto/ec/ec_lcl.h +--- openssl-1.1.1e.orig/crypto/ec/ec_local.h 2020-03-20 13:03:13.823258089 +0100 ++++ openssl-1.1.1e/crypto/ec/ec_local.h 2020-03-20 13:03:17.251276075 +0100 @@ -179,6 +179,14 @@ struct ec_method_st { /* custom ECDH operation */ int (*ecdh_compute_key)(unsigned char **pout, size_t *poutlen, @@ -74,13 +74,13 @@ int ED25519_sign(uint8_t *out_sig, const uint8_t *message, size_t message_len, const uint8_t public_key[32], const uint8_t private_key[32]); -Index: openssl-1.1.1d/crypto/ec/ecdsa_ossl.c +Index: openssl-1.1.1e/crypto/ec/ecdsa_ossl.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecdsa_ossl.c -+++ openssl-1.1.1d/crypto/ec/ecdsa_ossl.c +--- openssl-1.1.1e.orig/crypto/ec/ecdsa_ossl.c 2020-03-20 13:03:13.823258089 +0100 ++++ openssl-1.1.1e/crypto/ec/ecdsa_ossl.c 2020-03-20 13:03:54.463471314 +0100 @@ -14,6 +14,41 @@ - #include "internal/bn_int.h" - #include "ec_lcl.h" + #include "crypto/bn.h" + #include "ec_local.h" +int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, + BIGNUM **rp) @@ -359,10 +359,10 @@ goto err; } /* if the signature is correct u1 is equal to sig->r */ -Index: openssl-1.1.1d/crypto/ec/ecp_mont.c +Index: openssl-1.1.1e/crypto/ec/ecp_mont.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_mont.c -+++ openssl-1.1.1d/crypto/ec/ecp_mont.c +--- openssl-1.1.1e.orig/crypto/ec/ecp_mont.c 2020-03-20 13:03:13.823258089 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_mont.c 2020-03-20 13:03:17.251276075 +0100 @@ -63,6 +63,9 @@ const EC_METHOD *EC_GFp_mont_method(void 0, /* keycopy */ 0, /* keyfinish */ @@ -373,10 +373,10 @@ 0, /* field_inverse_mod_ord */ ec_GFp_simple_blind_coordinates, ec_GFp_simple_ladder_pre, -Index: openssl-1.1.1d/crypto/ec/ecp_nist.c +Index: openssl-1.1.1e/crypto/ec/ecp_nist.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_nist.c -+++ openssl-1.1.1d/crypto/ec/ecp_nist.c +--- openssl-1.1.1e.orig/crypto/ec/ecp_nist.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_nist.c 2020-03-20 13:03:17.251276075 +0100 @@ -65,6 +65,9 @@ const EC_METHOD *EC_GFp_nist_method(void 0, /* keycopy */ 0, /* keyfinish */ @@ -387,10 +387,10 @@ 0, /* field_inverse_mod_ord */ ec_GFp_simple_blind_coordinates, ec_GFp_simple_ladder_pre, -Index: openssl-1.1.1d/crypto/ec/ecp_nistp224.c +Index: openssl-1.1.1e/crypto/ec/ecp_nistp224.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_nistp224.c -+++ openssl-1.1.1d/crypto/ec/ecp_nistp224.c +--- openssl-1.1.1e.orig/crypto/ec/ecp_nistp224.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_nistp224.c 2020-03-20 13:03:17.251276075 +0100 @@ -291,6 +291,9 @@ const EC_METHOD *EC_GFp_nistp224_method( ec_key_simple_generate_public_key, 0, /* keycopy */ @@ -401,11 +401,11 @@ ecdh_simple_compute_key, 0, /* field_inverse_mod_ord */ 0, /* blind_coordinates */ -Index: openssl-1.1.1d/crypto/ec/ecp_nistp256.c +Index: openssl-1.1.1e/crypto/ec/ecp_nistp256.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_nistp256.c -+++ openssl-1.1.1d/crypto/ec/ecp_nistp256.c -@@ -1809,6 +1809,9 @@ const EC_METHOD *EC_GFp_nistp256_method( +--- openssl-1.1.1e.orig/crypto/ec/ecp_nistp256.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_nistp256.c 2020-03-20 13:03:17.251276075 +0100 +@@ -1829,6 +1829,9 @@ const EC_METHOD *EC_GFp_nistp256_method( 0, /* keycopy */ 0, /* keyfinish */ ecdh_simple_compute_key, @@ -415,11 +415,11 @@ 0, /* field_inverse_mod_ord */ 0, /* blind_coordinates */ 0, /* ladder_pre */ -Index: openssl-1.1.1d/crypto/ec/ecp_nistp521.c +Index: openssl-1.1.1e/crypto/ec/ecp_nistp521.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_nistp521.c -+++ openssl-1.1.1d/crypto/ec/ecp_nistp521.c -@@ -1651,6 +1651,9 @@ const EC_METHOD *EC_GFp_nistp521_method( +--- openssl-1.1.1e.orig/crypto/ec/ecp_nistp521.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_nistp521.c 2020-03-20 13:03:17.251276075 +0100 +@@ -1669,6 +1669,9 @@ const EC_METHOD *EC_GFp_nistp521_method( 0, /* keycopy */ 0, /* keyfinish */ ecdh_simple_compute_key, @@ -429,11 +429,11 @@ 0, /* field_inverse_mod_ord */ 0, /* blind_coordinates */ 0, /* ladder_pre */ -Index: openssl-1.1.1d/crypto/ec/ecp_nistz256.c +Index: openssl-1.1.1e/crypto/ec/ecp_nistz256.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_nistz256.c -+++ openssl-1.1.1d/crypto/ec/ecp_nistz256.c -@@ -1689,6 +1689,9 @@ const EC_METHOD *EC_GFp_nistz256_method( +--- openssl-1.1.1e.orig/crypto/ec/ecp_nistz256.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_nistz256.c 2020-03-20 13:03:17.251276075 +0100 +@@ -1720,6 +1720,9 @@ const EC_METHOD *EC_GFp_nistz256_method( 0, /* keycopy */ 0, /* keyfinish */ ecdh_simple_compute_key, @@ -443,10 +443,10 @@ ecp_nistz256_inv_mod_ord, /* can be #define-d NULL */ 0, /* blind_coordinates */ 0, /* ladder_pre */ -Index: openssl-1.1.1d/crypto/ec/ecp_s390x_nistp.c +Index: openssl-1.1.1e/crypto/ec/ecp_s390x_nistp.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_s390x_nistp.c -+++ openssl-1.1.1d/crypto/ec/ecp_s390x_nistp.c +--- openssl-1.1.1e.orig/crypto/ec/ecp_s390x_nistp.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_s390x_nistp.c 2020-03-20 13:03:17.251276075 +0100 @@ -175,6 +175,9 @@ const EC_METHOD *EC_GFp_s390x_nistp##bit NULL, /* keycopy */ \ NULL, /* keyfinish */ \ @@ -457,10 +457,10 @@ NULL, /* field_inverse_mod_ord */ \ ec_GFp_simple_blind_coordinates, \ ec_GFp_simple_ladder_pre, \ -Index: openssl-1.1.1d/crypto/ec/ecp_smpl.c +Index: openssl-1.1.1e/crypto/ec/ecp_smpl.c =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ecp_smpl.c -+++ openssl-1.1.1d/crypto/ec/ecp_smpl.c +--- openssl-1.1.1e.orig/crypto/ec/ecp_smpl.c 2020-03-20 13:03:13.827258110 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_smpl.c 2020-03-20 13:03:17.251276075 +0100 @@ -64,6 +64,9 @@ const EC_METHOD *EC_GFp_simple_method(vo 0, /* keycopy */ 0, /* keyfinish */ @@ -471,10 +471,10 @@ 0, /* field_inverse_mod_ord */ ec_GFp_simple_blind_coordinates, ec_GFp_simple_ladder_pre, -Index: openssl-1.1.1d/crypto/err/openssl.txt +Index: openssl-1.1.1e/crypto/err/openssl.txt =================================================================== ---- openssl-1.1.1d.orig/crypto/err/openssl.txt -+++ openssl-1.1.1d/crypto/err/openssl.txt +--- openssl-1.1.1e.orig/crypto/err/openssl.txt 2020-03-20 13:03:13.831258131 +0100 ++++ openssl-1.1.1e/crypto/err/openssl.txt 2020-03-20 13:03:17.251276075 +0100 @@ -496,6 +496,9 @@ EC_F_ECDSA_SIGN_EX:254:ECDSA_sign_ex EC_F_ECDSA_SIGN_SETUP:248:ECDSA_sign_setup EC_F_ECDSA_SIG_NEW:265:ECDSA_SIG_new @@ -493,7 +493,7 @@ EC_F_OSSL_ECDSA_SIGN_SIG:249:ossl_ecdsa_sign_sig EC_F_OSSL_ECDSA_VERIFY_SIG:250:ossl_ecdsa_verify_sig EC_F_PKEY_ECD_CTRL:271:pkey_ecd_ctrl -@@ -2130,6 +2134,7 @@ EC_R_BUFFER_TOO_SMALL:100:buffer too sma +@@ -2133,6 +2137,7 @@ EC_R_BUFFER_TOO_SMALL:100:buffer too sma EC_R_CANNOT_INVERT:165:cannot invert EC_R_COORDINATES_OUT_OF_RANGE:146:coordinates out of range EC_R_CURVE_DOES_NOT_SUPPORT_ECDH:160:curve does not support ecdh @@ -501,10 +501,10 @@ EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING:159:curve does not support signing EC_R_D2I_ECPKPARAMETERS_FAILURE:117:d2i ecpkparameters failure EC_R_DECODE_ERROR:142:decode error -Index: openssl-1.1.1d/include/openssl/ecerr.h +Index: openssl-1.1.1e/include/openssl/ecerr.h =================================================================== ---- openssl-1.1.1d.orig/include/openssl/ecerr.h -+++ openssl-1.1.1d/include/openssl/ecerr.h +--- openssl-1.1.1e.orig/include/openssl/ecerr.h 2020-03-20 13:03:13.831258131 +0100 ++++ openssl-1.1.1e/include/openssl/ecerr.h 2020-03-20 13:03:17.251276075 +0100 @@ -41,6 +41,9 @@ int ERR_load_EC_strings(void); # define EC_F_ECDSA_SIGN_EX 254 # define EC_F_ECDSA_SIGN_SETUP 248 @@ -515,7 +515,7 @@ # define EC_F_ECDSA_VERIFY 253 # define EC_F_ECD_ITEM_VERIFY 270 # define EC_F_ECKEY_PARAM2TYPE 223 -@@ -185,6 +186,7 @@ int ERR_load_EC_strings(void); +@@ -185,6 +188,7 @@ int ERR_load_EC_strings(void); # define EC_F_O2I_ECPUBLICKEY 152 # define EC_F_OLD_EC_PRIV_DECODE 222 # define EC_F_OSSL_ECDH_COMPUTE_KEY 247 @@ -523,7 +523,7 @@ # define EC_F_OSSL_ECDSA_SIGN_SIG 249 # define EC_F_OSSL_ECDSA_VERIFY_SIG 250 # define EC_F_PKEY_ECD_CTRL 271 -@@ -212,6 +214,7 @@ int ERR_load_EC_strings(void); +@@ -212,6 +216,7 @@ int ERR_load_EC_strings(void); # define EC_R_CANNOT_INVERT 165 # define EC_R_COORDINATES_OUT_OF_RANGE 146 # define EC_R_CURVE_DOES_NOT_SUPPORT_ECDH 160 ++++++ openssl-assembly-pack-accelerate-scalar-multiplication.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.305355743 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.309355746 +0200 @@ -14,7 +14,7 @@ --- crypto/ec/build.info | 3 +- crypto/ec/ec_curve.c | 42 +++++--- - crypto/ec/ec_lcl.h | 5 + + crypto/ec/ec_local.h | 5 + crypto/ec/ecp_s390x_nistp.c | 197 ++++++++++++++++++++++++++++++++++++ 4 files changed, 234 insertions(+), 13 deletions(-) create mode 100644 crypto/ec/ecp_s390x_nistp.c @@ -65,10 +65,10 @@ #elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128) EC_GFp_nistp256_method, #else -Index: openssl-1.1.1d/crypto/ec/ec_lcl.h +Index: openssl-1.1.1d/crypto/ec/ec_local.h =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ec_lcl.h -+++ openssl-1.1.1d/crypto/ec/ec_lcl.h +--- openssl-1.1.1d.orig/crypto/ec/ec_local.h ++++ openssl-1.1.1d/crypto/ec/ec_local.h @@ -587,6 +587,11 @@ int ec_group_simple_order_bits(const EC_ */ const EC_METHOD *EC_GFp_nistz256_method(void); @@ -98,7 +98,7 @@ +#include <stdlib.h> +#include <string.h> +#include <openssl/err.h> -+#include "ec_lcl.h" ++#include "ec_local.h" +#include "s390x_arch.h" + +/* Size of parameter blocks */ ++++++ openssl-fips_selftest_upstream_drbg.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.333355765 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.333355765 +0200 @@ -1,7 +1,7 @@ -Index: openssl-1.1.1d/crypto/fips/drbgtest.c +Index: openssl-1.1.1e/crypto/fips/drbgtest.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.1.1d/crypto/fips/drbgtest.c 2020-02-26 19:21:37.798616477 +0100 ++++ openssl-1.1.1e/crypto/fips/drbgtest.c 2020-03-20 14:15:42.114115340 +0100 @@ -0,0 +1,1178 @@ +/* + * Copyright 2011-2019 The OpenSSL Project Authors. All Rights Reserved. @@ -20,8 +20,8 @@ +#include <openssl/obj_mac.h> +#include <openssl/evp.h> +#include <openssl/aes.h> -+#include "../crypto/rand/rand_lcl.h" -+#include "../crypto/include/internal/rand_int.h" ++#include "../crypto/rand/rand_local.h" ++#include "../include/crypto/rand.h" + +#if defined(_WIN32) +# include <windows.h> @@ -1181,10 +1181,10 @@ + return 1; +} + -Index: openssl-1.1.1d/crypto/fips/drbgtest.h +Index: openssl-1.1.1e/crypto/fips/drbgtest.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.1.1d/crypto/fips/drbgtest.h 2020-02-26 14:33:10.746715249 +0100 ++++ openssl-1.1.1e/crypto/fips/drbgtest.h 2020-03-20 14:15:42.114115340 +0100 @@ -0,0 +1,579 @@ +/* + * Copyright 2011-2017 The OpenSSL Project Authors. All Rights Reserved. @@ -1765,10 +1765,10 @@ + 0xef, 0xd2, 0xd8, 0x5c, 0xdc, 0x62, 0x25, 0x9f, 0xaa, 0x1e, 0x2c, 0x67, + 0xf6, 0x02, 0x32, 0xe2 +}; -Index: openssl-1.1.1d/crypto/fips/fips_post.c +Index: openssl-1.1.1e/crypto/fips/fips_post.c =================================================================== ---- openssl-1.1.1d.orig/crypto/fips/fips_post.c 2020-02-26 14:33:10.438713461 +0100 -+++ openssl-1.1.1d/crypto/fips/fips_post.c 2020-02-26 16:44:09.488165757 +0100 +--- openssl-1.1.1e.orig/crypto/fips/fips_post.c 2020-03-20 14:15:40.018104341 +0100 ++++ openssl-1.1.1e/crypto/fips/fips_post.c 2020-03-20 14:15:42.114115340 +0100 @@ -51,7 +51,6 @@ #include <openssl/crypto.h> @@ -1777,22 +1777,10 @@ #include <openssl/err.h> #include <openssl/bio.h> #include <openssl/hmac.h> -Index: openssl-1.1.1d/crypto/rand/rand_lib.c +Index: openssl-1.1.1e/crypto/fips/build.info =================================================================== ---- openssl-1.1.1d.orig/crypto/rand/rand_lib.c 2020-02-26 14:33:10.442713484 +0100 -+++ openssl-1.1.1d/crypto/rand/rand_lib.c 2020-02-26 16:43:50.992058552 +0100 -@@ -18,7 +18,6 @@ - #include "e_os.h" - #ifdef OPENSSL_FIPS - # include <openssl/fips.h> --# include <openssl/fips_rand.h> - #endif - - #ifndef OPENSSL_NO_ENGINE -Index: openssl-1.1.1d/crypto/fips/build.info -=================================================================== ---- openssl-1.1.1d.orig/crypto/fips/build.info 2020-02-26 16:41:37.415284331 +0100 -+++ openssl-1.1.1d/crypto/fips/build.info 2020-02-26 16:42:55.943739496 +0100 +--- openssl-1.1.1e.orig/crypto/fips/build.info 2020-03-20 14:15:40.018104341 +0100 ++++ openssl-1.1.1e/crypto/fips/build.info 2020-03-20 14:15:42.114115340 +0100 @@ -2,7 +2,7 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ fips_aes_selftest.c fips_des_selftest.c fips_hmac_selftest.c \ @@ -1802,10 +1790,10 @@ fips_drbg_lib.c fips_drbg_rand.c fips_drbg_selftest.c fips_rand_lib.c \ fips_cmac_selftest.c fips_ecdh_selftest.c fips_ecdsa_selftest.c \ fips_dh_selftest.c fips_ers.c -Index: openssl-1.1.1d/crypto/fips/fips_drbg_selftest.c +Index: openssl-1.1.1e/crypto/fips/fips_drbg_selftest.c =================================================================== ---- openssl-1.1.1d.orig/crypto/fips/fips_drbg_selftest.c 2020-02-26 16:41:37.415284331 +0100 -+++ openssl-1.1.1d/crypto/fips/fips_drbg_selftest.c 2020-02-26 16:42:55.943739496 +0100 +--- openssl-1.1.1e.orig/crypto/fips/fips_drbg_selftest.c 2020-03-20 14:15:40.018104341 +0100 ++++ openssl-1.1.1e/crypto/fips/fips_drbg_selftest.c 2020-03-20 14:15:42.114115340 +0100 @@ -774,6 +774,7 @@ int FIPS_drbg_health_check(DRBG_CTX *dct return rv; } @@ -1822,10 +1810,10 @@ int FIPS_selftest_drbg_all(void) { -Index: openssl-1.1.1d/crypto/fips/fips.c +Index: openssl-1.1.1e/crypto/fips/fips.c =================================================================== ---- openssl-1.1.1d.orig/crypto/fips/fips.c 2020-02-26 14:33:10.642714645 +0100 -+++ openssl-1.1.1d/crypto/fips/fips.c 2020-02-26 16:44:16.508206446 +0100 +--- openssl-1.1.1e.orig/crypto/fips/fips.c 2020-03-20 14:15:40.018104341 +0100 ++++ openssl-1.1.1e/crypto/fips/fips.c 2020-03-20 14:15:42.114115340 +0100 @@ -50,7 +50,6 @@ #define _GNU_SOURCE ++++++ openssl-s390x-assembly-pack-accelerate-ECDSA.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.353355780 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.353355780 +0200 @@ -15,16 +15,16 @@ crypto/err/openssl.txt | 2 + 2 files changed, 200 insertions(+), 4 deletions(-) -diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c -index 0b03d7fd04..be81f0b8f0 100644 ---- a/crypto/ec/ecp_s390x_nistp.c -+++ b/crypto/ec/ecp_s390x_nistp.c +Index: openssl-1.1.1e/crypto/ec/ecp_s390x_nistp.c +=================================================================== +--- openssl-1.1.1e.orig/crypto/ec/ecp_s390x_nistp.c 2020-03-20 13:13:44.618571104 +0100 ++++ openssl-1.1.1e/crypto/ec/ecp_s390x_nistp.c 2020-03-20 13:14:20.398759363 +0100 @@ -10,6 +10,7 @@ #include <stdlib.h> #include <string.h> #include <openssl/err.h> +#include <openssl/rand.h> - #include "ec_lcl.h" + #include "ec_local.h" #include "s390x_arch.h" @@ -28,6 +29,15 @@ @@ -207,7 +207,7 @@ #define EC_GFP_S390X_NISTP_METHOD(bits) \ \ static int ec_GFp_s390x_nistp##bits##_mul(const EC_GROUP *group, \ -@@ -122,6 +289,29 @@ static int ec_GFp_s390x_nistp##bits##_mul(const EC_GROUP *group, \ +@@ -122,6 +289,29 @@ static int ec_GFp_s390x_nistp##bits##_mu S390X_SIZE_P##bits); \ } \ \ @@ -237,7 +237,7 @@ const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void) \ { \ static const EC_METHOD EC_GFp_s390x_nistp##bits##_meth = { \ -@@ -176,8 +366,8 @@ const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void) \ +@@ -176,8 +366,8 @@ const EC_METHOD *EC_GFp_s390x_nistp##bit NULL, /* keyfinish */ \ ecdh_simple_compute_key, \ ecdsa_simple_sign_setup, \ @@ -248,7 +248,7 @@ NULL, /* field_inverse_mod_ord */ \ ec_GFp_simple_blind_coordinates, \ ec_GFp_simple_ladder_pre, \ -@@ -186,8 +376,12 @@ const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void) \ +@@ -186,8 +376,12 @@ const EC_METHOD *EC_GFp_s390x_nistp##bit }; \ static const EC_METHOD *ret; \ \ @@ -263,11 +263,11 @@ ret = &EC_GFp_s390x_nistp##bits##_meth; \ else \ ret = EC_GFp_mont_method(); \ -diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt -index 035bd729f3..5d5981035c 100644 ---- a/crypto/err/openssl.txt -+++ b/crypto/err/openssl.txt -@@ -554,6 +554,8 @@ EC_F_ECDSA_VERIFY:253:ECDSA_verify +Index: openssl-1.1.1e/crypto/err/openssl.txt +=================================================================== +--- openssl-1.1.1e.orig/crypto/err/openssl.txt 2020-03-20 13:13:44.618571104 +0100 ++++ openssl-1.1.1e/crypto/err/openssl.txt 2020-03-20 13:14:02.446664907 +0100 +@@ -499,6 +499,8 @@ EC_F_ECDSA_VERIFY:253:ECDSA_verify EC_F_ECDSA_SIMPLE_SIGN_SETUP:310:ecdsa_simple_sign_setup EC_F_ECDSA_SIMPLE_SIGN_SIG:311:ecdsa_simple_sign_sig EC_F_ECDSA_SIMPLE_VERIFY_SIG:312:ecdsa_simple_verify_sig @@ -276,6 +276,3 @@ EC_F_ECD_ITEM_VERIFY:270:ecd_item_verify EC_F_ECKEY_PARAM2TYPE:223:eckey_param2type EC_F_ECKEY_PARAM_DECODE:212:eckey_param_decode --- -2.24.0 - ++++++ openssl-s390x-assembly-pack-accelerate-X25519-X448-Ed25519-and-Ed448.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.365355790 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.365355790 +0200 @@ -16,7 +16,7 @@ crypto/dsa/dsa_pmeth.c | 7 +- crypto/ec/build.info | 2 +- crypto/ec/ec_curve.c | 12 +- - crypto/ec/ec_lcl.h | 2 +- + crypto/ec/ec_local.h | 2 +- crypto/ec/ec_pmeth.c | 7 +- crypto/ec/ecx_meth.c | 672 +++++++++++++++++++++++++++++- crypto/err/openssl.txt | 6 + @@ -122,10 +122,10 @@ EC_GFp_s390x_nistp256_method, #elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128) EC_GFp_nistp256_method, -Index: openssl-1.1.1d/crypto/ec/ec_lcl.h +Index: openssl-1.1.1d/crypto/ec/ec_local.h =================================================================== ---- openssl-1.1.1d.orig/crypto/ec/ec_lcl.h -+++ openssl-1.1.1d/crypto/ec/ec_lcl.h +--- openssl-1.1.1d.orig/crypto/ec/ec_local.h ++++ openssl-1.1.1d/crypto/ec/ec_local.h @@ -595,7 +595,7 @@ int ec_group_simple_order_bits(const EC_ */ const EC_METHOD *EC_GFp_nistz256_method(void); @@ -938,7 +938,7 @@ --- openssl-1.1.1d.orig/crypto/evp/pmeth_lib.c +++ openssl-1.1.1d/crypto/evp/pmeth_lib.c @@ -17,60 +17,67 @@ - #include "internal/evp_int.h" + #include "crypto/evp.h" #include "internal/numbers.h" +typedef const EVP_PKEY_METHOD *(*pmeth_fn)(void); @@ -1068,10 +1068,10 @@ if (app_pkey_methods == NULL) return NULL; idx -= OSSL_NELEM(standard_methods); -Index: openssl-1.1.1d/crypto/include/internal/evp_int.h +Index: openssl-1.1.1d/include/crypto/evp.h =================================================================== ---- openssl-1.1.1d.orig/crypto/include/internal/evp_int.h -+++ openssl-1.1.1d/crypto/include/internal/evp_int.h +--- openssl-1.1.1d.orig/include/crypto/evp.h ++++ openssl-1.1.1d/include/crypto/evp.h @@ -93,24 +93,24 @@ DEFINE_STACK_OF_CONST(EVP_PKEY_METHOD) void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); ++++++ openssl-s390x-assembly-pack-add-OPENSSL_s390xcap-environment.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.377355798 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.377355798 +0200 @@ -19,10 +19,10 @@ crypto/s390xcpuid.pl | 31 ++- 3 files changed, 556 insertions(+), 13 deletions(-) -Index: openssl-1.1.1d/crypto/s390x_arch.h +Index: openssl-1.1.1e/crypto/s390x_arch.h =================================================================== ---- openssl-1.1.1d.orig/crypto/s390x_arch.h -+++ openssl-1.1.1d/crypto/s390x_arch.h +--- openssl-1.1.1e.orig/crypto/s390x_arch.h 2020-03-17 15:31:17.000000000 +0100 ++++ openssl-1.1.1e/crypto/s390x_arch.h 2020-03-20 17:29:30.459520742 +0100 @@ -49,6 +49,9 @@ struct OPENSSL_s390xcap_st { extern struct OPENSSL_s390xcap_st OPENSSL_s390xcap_P; @@ -75,15 +75,15 @@ # define S390X_TRNG 114 /* Register 0 Flags */ -Index: openssl-1.1.1d/crypto/s390xcap.c +Index: openssl-1.1.1e/crypto/s390xcap.c =================================================================== ---- openssl-1.1.1d.orig/crypto/s390xcap.c -+++ openssl-1.1.1d/crypto/s390xcap.c +--- openssl-1.1.1e.orig/crypto/s390xcap.c 2020-03-17 15:31:17.000000000 +0100 ++++ openssl-1.1.1e/crypto/s390xcap.c 2020-03-20 17:29:58.011664305 +0100 @@ -13,15 +13,51 @@ #include <setjmp.h> #include <signal.h> #include "internal/cryptlib.h" -+#include "internal/ctype.h" ++#include "crypto/ctype.h" #include "s390x_arch.h" +#define LEN 128 @@ -636,10 +636,10 @@ + free(buff); + return rc; } -Index: openssl-1.1.1d/crypto/s390xcpuid.pl +Index: openssl-1.1.1e/crypto/s390xcpuid.pl =================================================================== ---- openssl-1.1.1d.orig/crypto/s390xcpuid.pl -+++ openssl-1.1.1d/crypto/s390xcpuid.pl +--- openssl-1.1.1e.orig/crypto/s390xcpuid.pl 2020-03-17 15:31:17.000000000 +0100 ++++ openssl-1.1.1e/crypto/s390xcpuid.pl 2020-03-20 17:29:30.459520742 +0100 @@ -38,7 +38,26 @@ OPENSSL_s390x_facilities: stg %r0,S390X_STFLE+8(%r4) # wipe capability vectors stg %r0,S390X_STFLE+16(%r4) ++++++ openssl-s390x-fix-x448-and-x448-test-vector-ctime-for-x25519-and-x448.patch ++++++ --- /var/tmp/diff_new_pack.KEkd81/_old 2020-04-02 17:42:29.401355817 +0200 +++ /var/tmp/diff_new_pack.KEkd81/_new 2020-04-02 17:42:29.401355817 +0200 @@ -6,7 +6,7 @@ #ifdef S390X_EC_ASM # include "s390x_arch.h" -+# include "internal/constant_time_locl.h" ++# include "internal/constant_time.h" static void s390x_x25519_mod_p(unsigned char u[32]) { @@ -61,10 +61,10 @@ s390x_flip_endian64(param.x448.d_src, param.x448.d_src); param.x448.d_src[63] &= 252; -Index: openssl-1.1.1d/include/internal/constant_time_locl.h +Index: openssl-1.1.1d/include/internal/constant_timeh =================================================================== ---- openssl-1.1.1d.orig/include/internal/constant_time_locl.h -+++ openssl-1.1.1d/include/internal/constant_time_locl.h +--- openssl-1.1.1d.orig/include/internal/constant_time.h ++++ openssl-1.1.1d/include/internal/constant_time.h @@ -353,6 +353,34 @@ static ossl_inline void constant_time_co } ++++++ openssl-unknown_dgst.patch ++++++ Index: openssl-1.1.1d/apps/dgst.c =================================================================== --- openssl-1.1.1d.orig/apps/dgst.c 2019-09-10 15:13:07.000000000 +0200 +++ openssl-1.1.1d/apps/dgst.c 2020-03-20 11:20:27.618536409 +0100 @@ -95,6 +95,10 @@ int dgst_main(int argc, char **argv) prog = opt_progname(argv[0]); buf = app_malloc(BUFSIZE, "I/O buffer"); md = EVP_get_digestbyname(prog); + if (md == NULL && strcmp(prog, "dgst") != 0) { + BIO_printf(bio_err, "%s is not a known digest\n", prog); + goto end; + } prog = opt_init(argc, argv, dgst_options); while ((o = opt_next()) != OPT_EOF) {
