forked from pool/openssl-1_1
02427a3414
* All the minor versions of the 1.1.x openssl branch have the same
sonum and keep ABI compatibility
- Remove bit obsolete syntax
- Use %license macro
- Don't disable afalgeng on aarch64
- Add support for s390x CPACF enhancements (fate#321518)
patches taken from https://github.com/openssl/openssl/pull/2859:
* 0002-crypto-modes-asm-ghash-s390x.pl-fix-gcm_gmult_4bit-K.patch
* 0004-s390x-assembly-pack-add-OPENSSL_s390xcap-environment.patch
* 0005-s390x-assembly-pack-add-OPENSSL_s390xcap-man-page.patch
* 0006-s390x-assembly-pack-extended-s390x-capability-vector.patch
* 0007-crypto-evp-e_aes.c-add-foundations-for-extended-s390.patch
* 0008-s390x-assembly-pack-extended-s390x-capability-vector.patch
* 0009-crypto-aes-asm-aes-s390x.pl-add-KMA-code-path.patch
* 0010-doc-man3-OPENSSL_s390xcap.pod-update-KMA.patch
* 0011-crypto-aes-asm-aes-s390x.pl-add-CFI-annotations-KMA-.patch
* 0012-s390x-assembly-pack-add-KMA-code-path-for-aes-gcm.patch
* 0013-crypto-aes-asm-aes-s390x.pl-add-CFI-annotations-KMA-.patch
- Do not filter pkgconfig() provides/requires.
- Obsolete openssl-1_0_0 by openssl-1_1_0: this is required for a
clean upgrade path as an aid to zypp (boo#1070003).
- Update to 1.1.0g
OpenSSL Security Advisory [02 Nov 2017]
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=2
63 lines
1.6 KiB
Diff
63 lines
1.6 KiB
Diff
From f34474dd00118128ed574e838895167efddf7359 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
Date: Tue, 14 Feb 2017 11:15:51 +0100
|
|
Subject: [PATCH 11/44] crypto/aes/asm/aes-s390x.pl: add CFI annotations (KMA
|
|
code path).
|
|
|
|
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
---
|
|
crypto/aes/asm/aes-s390x.pl | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
|
|
index 750f61e87a..6cabdf5069 100644
|
|
--- a/crypto/aes/asm/aes-s390x.pl
|
|
+++ b/crypto/aes/asm/aes-s390x.pl
|
|
@@ -1392,6 +1392,7 @@ $code.=<<___;
|
|
.type AES_ctr32_encrypt,\@function
|
|
.align 16
|
|
AES_ctr32_encrypt:
|
|
+.cfi_startproc
|
|
xgr %r3,%r4 # flip %r3 and %r4, $out and $len
|
|
xgr %r4,%r3
|
|
xgr %r3,%r4
|
|
@@ -1404,6 +1405,8 @@ $code.=<<___ if (!$softonly);
|
|
jl .Lctr32_software
|
|
|
|
stm${g} $s2,$s3,10*$SIZE_T($sp)
|
|
+ .cfi_rel_offset $s2,10*$SIZE_T
|
|
+ .cfi_rel_offset $s3,11*$SIZE_T
|
|
llgfr $s2,%r0
|
|
larl %r1,OPENSSL_s390xcap_P
|
|
llihh %r0,0x8000 # check if kma supports the function code
|
|
@@ -1413,6 +1416,7 @@ $code.=<<___ if (!$softonly);
|
|
jz .Lctr32_nokma
|
|
|
|
aghi $sp,-112
|
|
+ .cfi_adjust_cfa_offset 112
|
|
lhi %r1,0x0600
|
|
sllg $len,$len,4
|
|
or %r0,%r1 # set HS and LAAD flags
|
|
@@ -1429,7 +1433,10 @@ $code.=<<___ if (!$softonly);
|
|
|
|
xc 80(32,$sp),80($sp) # wipe key copy
|
|
la $sp,112($sp)
|
|
+ .cfi_adjust_cfa_offset -112
|
|
lm${g} $s2,$s3,10*$SIZE_T($sp)
|
|
+ .cfi_restore $s2
|
|
+ .cfi_restore $s3
|
|
br $ra
|
|
|
|
.align 16
|
|
@@ -1594,6 +1601,7 @@ $code.=<<___;
|
|
|
|
lm${g} %r6,$ra,6*$SIZE_T($sp)
|
|
br $ra
|
|
+.cfi_endproc
|
|
.size AES_ctr32_encrypt,.-AES_ctr32_encrypt
|
|
___
|
|
}
|
|
--
|
|
2.13.6
|
|
|