[openssl-ibmca] - Fix multilib conflict in sample config file (#1076423) - Fixed message digest length definition in

[Dan Horák]

commit 49f50c03f88308bc9e2d148e355b24163d2076a3
Author: Dan Horák <dan at danny.cz>
Date:   Fri Mar 14 12:52:55 2014 +0100

    - Fix multilib conflict in sample config file (#1076423)
    - Fixed message digest length definition in sha256 template (#1074976)

 openssl-ibmca-1.2.0-sha256-length.patch |   12 ++++++++++++
 openssl-ibmca.spec                      |   13 +++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/openssl-ibmca-1.2.0-sha256-length.patch b/openssl-ibmca-1.2.0-sha256-length.patch
new file mode 100644
index 0000000..deb312f
--- /dev/null
+++ b/openssl-ibmca-1.2.0-sha256-length.patch
@@ -0,0 +1,12 @@
+diff -up openssl-ibmca-1.2.0/e_ibmca.c.1074976 openssl-ibmca-1.2.0/e_ibmca.c
+--- openssl-ibmca-1.2.0/e_ibmca.c.1074976	2014-03-12 16:17:01.662178599 +0100
++++ openssl-ibmca-1.2.0/e_ibmca.c	2014-03-12 16:17:25.582178365 +0100
+@@ -727,7 +727,7 @@ static const EVP_MD ibmca_sha1 = {
+ static const EVP_MD ibmca_sha256 = {
+ 	NID_sha256,
+ 	NID_sha256WithRSAEncryption,
+-	SHA_HASH_LENGTH,
++	SHA256_HASH_LENGTH,
+ 	0,
+ 	ibmca_sha256_init,
+ 	ibmca_sha256_update,
diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec
index 65fd6dc..3426459 100644
--- a/openssl-ibmca.spec
+++ b/openssl-ibmca.spec
@@ -1,7 +1,7 @@
 Summary: A dynamic OpenSSL engine for IBMCA
 Name: openssl-ibmca
 Version: 1.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: OpenSSL
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/opencryptoki
@@ -10,6 +10,9 @@ Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz
 Patch0: openssl-ibmca-1.2.0-libica-soname.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=749638
 Patch1: openssl-ibmca-1.2.0-ofb.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1074976
+# https://sourceforge.net/p/opencryptoki/ibmca/ci/f204aca935dfe45b736e9fb8f822c9e79ec9747c/
+Patch2: openssl-ibmca-1.2.0-sha256-length.patch
 Requires: libica >= 2.1.0
 BuildRequires: libica-devel >= 2.1.0
 BuildRequires: automake libtool
@@ -23,6 +26,7 @@ A dynamic OpenSSL engine for IBMCA crypto hardware on IBM zSeries machines.
 %setup -q
 %patch0 -p1 -b .libica-soname
 %patch1 -p0 -b .ofb
+%patch2 -p1 -b .1074976
 
 sh ./bootstrap.sh
 
@@ -39,13 +43,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libibmca.la
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/openssl/engines
 mv $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/openssl/engines
 
+mv openssl.cnf.sample openssl.cnf.sample.%{_arch}
 
 %files
-%doc README openssl.cnf.sample
+%doc README openssl.cnf.sample.%{_arch}
 %{_libdir}/openssl/engines/libibmca.so
 
 
 %changelog
+* Fri Mar 14 2014 Dan Horák <dan[at]danny.cz - 1.2.0-7
+- Fix multilib conflict in sample config file (#1076423)
+- Fixed message digest length definition in sha256 template (#1074976)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild