forked from pool/openssl-ibmca
Accepting request 487432 from security
1 OBS-URL: https://build.opensuse.org/request/show/487432 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-ibmca?expand=0&rev=26
This commit is contained in:
parent
fbceffe006
commit
06e03e382b
@ -0,0 +1,27 @@
|
||||
From e11b35d9039291253d408ceb09b47a94e79d766f Mon Sep 17 00:00:00 2001
|
||||
From: Paulo Vital <pvital@linux.vnet.ibm.com>
|
||||
Date: Thu, 30 Mar 2017 11:48:53 -0300
|
||||
Subject: [ibmca PATCH] Fix SHA512 EVP digest struct to use
|
||||
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE
|
||||
|
||||
Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com>
|
||||
---
|
||||
src/e_ibmca.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/e_ibmca.c b/src/e_ibmca.c
|
||||
index 6220be8..35fa66c 100644
|
||||
--- a/src/e_ibmca.c
|
||||
+++ b/src/e_ibmca.c
|
||||
@@ -792,7 +792,7 @@ static const EVP_MD ibmca_sha512 = {
|
||||
NID_sha512,
|
||||
NID_sha512WithRSAEncryption,
|
||||
SHA512_HASH_LENGTH,
|
||||
- 0,
|
||||
+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE,
|
||||
ibmca_sha512_init,
|
||||
ibmca_sha512_update,
|
||||
ibmca_sha512_final,
|
||||
--
|
||||
2.9.3
|
||||
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 11 15:09:03 UTC 2017 - mpost@suse.com
|
||||
|
||||
- Added openssl-ibmca-fix-sha512-evp-digest-to-use-evp_md_flag_pkey_method_signature.patch (bsc#1032113)
|
||||
- Added libica-tools to the BuildRequires due to repackaging of libica.
|
||||
- Renamed BuildRequires from libica2-devel to libica-devel for the
|
||||
same reason.
|
||||
- Tweaked a comment to get rid of an rpmlint warning message.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 09:36:50 UTC 2016 - meissner@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package openssl-ibmca
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -27,9 +27,10 @@ Source: http://sourceforge.net/projects/opencryptoki/files/libica%%20Ope
|
||||
Source1: baselibs.conf
|
||||
Patch1: openssl-ibmca-configure.patch
|
||||
Patch2: openssl-ibmca-fix-enginepath.patch
|
||||
BuildRequires: libica2-devel >= 2.4.0
|
||||
Patch3: openssl-ibmca-fix-sha512-evp-digest-to-use-evp_md_flag_pkey_method_signature.patch
|
||||
BuildRequires: libica-devel >= 2.4.0
|
||||
BuildRequires: libica-tools >= 2.4.0
|
||||
BuildRequires: openssl-devel
|
||||
Requires: libica2 >= 2.4.0
|
||||
Requires: openssl
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: s390 s390x
|
||||
@ -42,6 +43,7 @@ IBM eServer Cryptographic Accelerator (ICA).
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
@ -95,7 +97,7 @@ if [ -f ${SSLCNF} -a -f ${SSLSMP} ]; then
|
||||
fi
|
||||
|
||||
%postun
|
||||
if [ $1 -eq 0 ]; then #last uninstall, modify %{_sysconfdir}/openssl.cnf (bsc#942839)
|
||||
if [ $1 -eq 0 ]; then # last uninstall, modify %%{_sysconfdir}/openssl.cnf (bsc#942839)
|
||||
SSLCNF=%{_sysconfdir}/ssl/openssl.cnf
|
||||
if [ -f ${SSLCNF}.orig ]; then
|
||||
mv ${SSLCNF}.orig ${SSLCNF}
|
||||
|
Loading…
Reference in New Issue
Block a user