c29de1fbdc
Add million FIPS and s390 patches - Temporarily ignore broken OPENSSL_INIT_NO_ATEXIT due to our layered FIPS initialization * openssl-fips-ignore_broken_atexit_test.patch - Import FIPS patches from SLE-15 * openssl-fips-dont_run_FIPS_module_installed.patch * openssl-fips_mode.patch * openssl-ship_fips_standalone_hmac.patch * openssl-fips-clearerror.patch * openssl-fips-selftests_in_nonfips_mode.patch - Don't run FIPS power-up self-tests when the checksum files aren't installed (bsc#1042392) * add openssl-fips-run_selftests_only_when_module_is_complete.patch - Import FIPS patches from Fedora (bsc#1157702, jsc#SLE-9553) * openssl-1.1.1-fips-crng-test.patch * openssl-1.1.1-fips-post-rand.patch * openssl-1.1.1-fips.patch * openssl-1.1.0-issuer-hash.patch * openssl-1.1.1-evp-kdf.patch * openssl-1.1.1-ssh-kdf.patch replaces openssl-jsc-SLE-8789-backport_KDF.patch - Support for CPACF enhancements - part 1 (crypto) [bsc#1152695, jsc#SLE-7861] - Add patches: * openssl-s390x-assembly-pack-add-OPENSSL_s390xcap-environment.patch * openssl-s390x-assembly-pack-add-support-for-pcc-and-kma-inst.patch * openssl-s390x-assembly-pack-add-OPENSSL_s390xcap-man-page.patch * openssl-s390x-assembly-pack-update-OPENSSL_s390xcap-3.patch * openssl-s390xcpuid.pl-fix-comment.patch OBS-URL: https://build.opensuse.org/request/show/766865 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=51
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 9baa4d5f4c9f596faba2b3e219b367a09c472d1d Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
Date: Wed, 3 Jul 2019 18:02:11 +0200
|
|
Subject: [PATCH 09203/10000] s390xcpuid.pl: fix comment
|
|
|
|
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
|
|
(Merged from https://github.com/openssl/openssl/pull/9348)
|
|
---
|
|
crypto/s390xcpuid.pl | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
Index: openssl-1.1.1d/crypto/s390xcpuid.pl
|
|
===================================================================
|
|
--- openssl-1.1.1d.orig/crypto/s390xcpuid.pl
|
|
+++ openssl-1.1.1d/crypto/s390xcpuid.pl
|
|
@@ -431,7 +431,7 @@ ___
|
|
}
|
|
|
|
################
|
|
-# void s390x_pcc(unsigned int fc, void *param)
|
|
+# int s390x_pcc(unsigned int fc, void *param)
|
|
{
|
|
my ($fc,$param) = map("%r$_",(2..3));
|
|
$code.=<<___;
|
|
@@ -456,8 +456,8 @@ ___
|
|
}
|
|
|
|
################
|
|
-# void s390x_kdsa(unsigned int fc, void *param,
|
|
-# const unsigned char *in, size_t len)
|
|
+# int s390x_kdsa(unsigned int fc, void *param,
|
|
+# const unsigned char *in, size_t len)
|
|
{
|
|
my ($fc,$param,$in,$len) = map("%r$_",(2..5));
|
|
$code.=<<___;
|