forked from pool/openssl-1_1
949eaaafb4
- Use upstream patch for the locale crash (bsc#1135550) - delete openssl-fix_underflow_in_errstr_handling.patch - add 0001-build_SYS_str_reasons-Fix-a-crash-caused-by-overlong.patch - Add s390x vectorized support for ChaCha20 and Poly1305 (jsc#SLE-6126, jsc#SLE-6129) * 0001-s390x-assembly-pack-perlasm-support.patch * 0002-crypto-chacha-asm-chacha-s390x.pl-add-vx-code-path.patch * 0003-crypto-poly1305-asm-poly1305-s390x.pl-add-vx-code-pa.patch * 0004-s390x-assembly-pack-fix-formal-interface-bug-in-chac.patch * 0005-s390x-assembly-pack-import-chacha-from-cryptogams-re.patch * 0006-s390x-assembly-pack-import-poly-from-cryptogams-repo.patch - Update to 1.1.1c (bsc#1133925, jsc#SLE-6430) - drop upstreamed patches: - update keyring by including Richard Levitte's key OBS-URL: https://build.opensuse.org/request/show/708112 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=38
32 lines
996 B
Diff
32 lines
996 B
Diff
From b2b580fe445e064da50c13d3e00f71022da16ece Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
Date: Fri, 15 Feb 2019 22:59:09 +0100
|
|
Subject: [PATCH] s390x assembly pack: fix formal interface bug in chacha
|
|
module
|
|
|
|
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
|
|
Reviewed-by: Tim Hudson <tjh@openssl.org>
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/8257)
|
|
---
|
|
crypto/chacha/asm/chacha-s390x.pl | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/crypto/chacha/asm/chacha-s390x.pl b/crypto/chacha/asm/chacha-s390x.pl
|
|
index 005c810e20..abf7283dd8 100755
|
|
--- a/crypto/chacha/asm/chacha-s390x.pl
|
|
+++ b/crypto/chacha/asm/chacha-s390x.pl
|
|
@@ -225,7 +225,7 @@ LABEL ("ChaCha20_ctr32");
|
|
larl ("%r1","OPENSSL_s390xcap_P");
|
|
|
|
lghi ("%r0",64);
|
|
-&{$z? \&cgr:\&cr} ($len,"%r0");
|
|
+&{$z? \&clgr:\&clr} ($len,"%r0");
|
|
jle ("_s390x_chacha_novx");
|
|
|
|
lg ("%r0","S390X_STFLE+16(%r1)");
|
|
--
|
|
2.21.0
|
|
|