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
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
From d137c24cbf25bae932dcfc0b58fa667a9ef63bf0 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
Date: Sun, 26 Feb 2017 22:36:39 +0100
|
|
Subject: [PATCH 13/44] crypto/aes/asm/aes-s390x.pl: add CFI annotations
|
|
(KMA-gcm code path).
|
|
|
|
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
---
|
|
crypto/aes/asm/aes-s390x.pl | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
|
|
index f23b1231c1..dfe79f84a6 100644
|
|
--- a/crypto/aes/asm/aes-s390x.pl
|
|
+++ b/crypto/aes/asm/aes-s390x.pl
|
|
@@ -2270,10 +2270,15 @@ $code.=<<___ if (!$softonly);
|
|
.type s390x_aes_gcm_blocks,\@function
|
|
.align 16
|
|
s390x_aes_gcm_blocks:
|
|
+.cfi_startproc
|
|
stm$g $alen,$enc,7*$SIZE_T($sp)
|
|
+ .cfi_rel_offset $alen,7*$SIZE_T
|
|
+ .cfi_rel_offset $key,8*$SIZE_T
|
|
+ .cfi_rel_offset $enc,9*$SIZE_T
|
|
lm$g $alen,$enc,$stdframe($sp)
|
|
|
|
aghi $sp,-112
|
|
+ .cfi_adjust_cfa_offset 112
|
|
|
|
lmg %r0,%r1,0($ctx)
|
|
ahi %r1,-1
|
|
@@ -2300,11 +2305,16 @@ s390x_aes_gcm_blocks:
|
|
xc 0(112,$sp),0($sp) # wipe stack
|
|
|
|
la $sp,112($sp)
|
|
+ .cfi_adjust_cfa_offset -112
|
|
ahi %r0,1
|
|
st %r0,12($ctx)
|
|
|
|
lm$g $alen,$enc,7*$SIZE_T($sp)
|
|
+ .cfi_restore $alen
|
|
+ .cfi_restore $key
|
|
+ .cfi_restore $enc
|
|
br $ra
|
|
+.cfi_endproc
|
|
.size s390x_aes_gcm_blocks,.-s390x_aes_gcm_blocks
|
|
___
|
|
}
|
|
--
|
|
2.13.6
|
|
|