diff --git a/Add-non-executable-gnu-stack-markings-in-the-assembl.patch b/Add-non-executable-gnu-stack-markings-in-the-assembl.patch new file mode 100644 index 0000000..622d6b2 --- /dev/null +++ b/Add-non-executable-gnu-stack-markings-in-the-assembl.patch @@ -0,0 +1,27 @@ +From 524659f8e042aed45015e1aca930a3cfe5ffa628 Mon Sep 17 00:00:00 2001 +From: Patrick Steuer +Date: Tue, 12 Jun 2018 14:36:45 +0200 +Subject: [PATCH 303/303] Add non-executable gnu stack markings in the + assembly. + +Signed-off-by: Patrick Steuer +--- + src/mp.pl | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/mp.pl b/src/mp.pl +index 3c73736..e249f61 100755 +--- a/src/mp.pl ++++ b/src/mp.pl +@@ -505,4 +505,8 @@ LONG (0x100e0f00,0x01020304,0x10050607,0x18191a1b); + LONG (0x10000102,0x03040506,0x10071819,0x1a1b1c1d); + LONG (0x00000000,0x00000018,0x00191a1b,0x1c1d1e1f); + ++VERBATIM("#if defined(__linux__) && defined(__ELF__)\n"); ++SECTION (".note.GNU-stack,\"\",%progbits"); ++VERBATIM("#endif\n"); ++ + PERLASM_END(); +-- +2.13.7 + diff --git a/increment-icastats-counter-for-aes-gcm.patch b/increment-icastats-counter-for-aes-gcm.patch deleted file mode 100644 index 872375c..0000000 --- a/increment-icastats-counter-for-aes-gcm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ae94822a5d949b45d5a5630ff2819b10e55f88d1 Mon Sep 17 00:00:00 2001 -From: Joerg Schmidbauer -Date: Mon, 13 Nov 2017 15:23:26 +0100 -Subject: [PATCH] Bugfix: Increment icastats counter for AES-GCM. - Signed-off-by: Joerg Schmidbauer - ---- - src/include/s390_gcm.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/include/s390_gcm.h b/src/include/s390_gcm.h -index 4f1d853..e856a1c 100644 ---- a/src/include/s390_gcm.h -+++ b/src/include/s390_gcm.h -@@ -749,6 +749,10 @@ static inline int s390_aes_gcm_kma(const unsigned char *in_data, - - if (rc >= 0) { - ctx->subkey_provided = 1; -+ if (ctx->direction) -+ stats_increment(ICA_STATS_AES_GCM, ALGO_HW, ENCRYPT); -+ else -+ stats_increment(ICA_STATS_AES_GCM, ALGO_HW, DECRYPT); - return 0; - } else - return EIO; diff --git a/libica-3.2.0.tar.gz b/libica-3.2.0.tar.gz deleted file mode 100644 index 70fb11c..0000000 --- a/libica-3.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b548095991269ef1ecfa081266ed7f43d46294bde48a0b7a4db63d1c0e212e50 -size 428645 diff --git a/libica-3.3.3.tar.gz b/libica-3.3.3.tar.gz new file mode 100644 index 0000000..8108cfa --- /dev/null +++ b/libica-3.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:034f20b74bacb049dac1a7797039369434dcde8035c96ca8a964471bf431b53a +size 467543 diff --git a/libica.changes b/libica.changes index 3652a84..bc6bca8 100644 --- a/libica.changes +++ b/libica.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Nov 14 18:01:37 UTC 2018 - mpost@suse.com + +- Upgraded to version 3.3.3 (Fate#325690) + * v3.3.3 + [PATCH] Various bug fixes + * v3.3.2 + [PATCH] Skip ECC tests if required HW is not available + [PATCH] Update spec file + * v3.3.1 + [PATCH] Fix configure.ac to honour CFLAGS + * v3.3.0 + [FEATURE] Add CEX supported elliptic-curve crypto interfaces + [FEATURE] Add SIMD supported multiple-precision arithmetic interfaces + [FEATURE] Add interface to enable/disable SW fallbacks + [FEATURE] Add 'make check' target, test-suite rework + * v3.2.1 + [FEATURE] Use z14 PRNO-TRNG to seed SHA512-DRBG. + [PATCH] Various bug fixes. +- Dropped obsolete patch increment-icastats-counter-for-aes-gcm.patch +- Removed COPYING from %files, since it is no longer in the tarball. +- Added Add-non-executable-gnu-stack-markings-in-the-assembl.patch + (bsc#1103493). +- Made multiple changes to the spec file based on the output of + spec-cleaner + ------------------------------------------------------------------- Mon Oct 22 19:09:13 UTC 2018 - mpost@suse.com @@ -36,8 +62,8 @@ Fri Sep 22 21:27:04 UTC 2017 - mpost@suse.com - Upgraded to version 3.2 (Fate#321517) * v3.2.0 - [FEATURE] New AES-GCM interface. - [UPDATE] Add symbol versioning. + [FEATURE] New AES-GCM interface. + [UPDATE] Add symbol versioning. * v3.1.1 [PATCH] Various bug fixes related to old and new AES-GCM implementations. [UPDATE] Add SHA3 test cases. Improved and extended test suite. diff --git a/libica.spec b/libica.spec index cd0e6a5..479bd1f 100644 --- a/libica.spec +++ b/libica.spec @@ -18,20 +18,16 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: libica -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: openssl-devel +Version: 3.3.3 +Release: 0 Summary: Library interface for the IBM Cryptographic Accelerator device driver License: CPL-1.0 Group: Hardware/Other -Version: 3.2.0 -Release: 0 +Url: https://github.com/opencryptoki/libica Source: libica-%{version}.tar.gz Source1: libica-SuSE.tar.bz2 # The icaioctl.h file came from https://sourceforge.net/p/opencryptoki/icadd/ci/master/tree/ @@ -40,11 +36,14 @@ Source4: README.SUSE Source5: sysconfig.z90crypt Source6: baselibs.conf Source7: %{name}-rpmlintrc -Patch1: increment-icastats-counter-for-aes-gcm.patch - -Url: https://github.com/opencryptoki/libica -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq %insserv_prereq +Patch1: Add-non-executable-gnu-stack-markings-in-the-assembl.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: openssl-devel +PreReq: %fillup_prereq +PreReq: %insserv_prereq ExclusiveArch: s390 s390x %description @@ -78,12 +77,12 @@ eServer Cryptographic Accelerator (ICA). %package devel Summary: Development files for the ICA device driver interface library Group: Development/Libraries/C and C++ +Requires: libica3 = %{version} +Requires: libopenssl-devel Obsoletes: libica-2_1_0-devel < %{version}-%{release} Provides: libica-2_1_0-devel = %{version}-%{release} Obsoletes: libica-2_3_0-devel < %{version}-%{release} Provides: libica-2_3_0-devel = %{version}-%{release} -Requires: libica3 = %{version} -Requires: libopenssl-devel %description devel This package contains the interface library routines used by IBM @@ -107,35 +106,37 @@ This RPM contains all the tools necessary to compile and link using the libica library. %prep -%setup -a 1 +%setup -q -a 1 %patch1 -p1 %build mkdir -p include/linux/ -cp %{S:3} include/linux/ +cp %{SOURCE3} include/linux/ autoreconf --force --install -%configure CPPFLAGS="-Iinclude -fPIC" CFLAGS="%optflags -fPIC" \ +%configure CPPFLAGS="-Iinclude -fPIC" CFLAGS="%{optflags} -fPIC" \ --enable-fips make clean make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/usr/include -make DESTDIR=$RPM_BUILD_ROOT install -cp -p include/ica_api.h $RPM_BUILD_ROOT/usr/include -cp -a SuSE/* $RPM_BUILD_ROOT -install -D %{S:5} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.z90crypt -cp -a $RPM_SOURCE_DIR/README.SUSE . -rm -f $RPM_BUILD_ROOT/%{_libdir}/libica.la +mkdir -p %{buildroot}%{_includedir} +%make_install +cp -p include/ica_api.h %{buildroot}%{_includedir} +cp -a SuSE/* %{buildroot} +install -D %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.z90crypt +cp -a %{_sourcedir}/README.SUSE . +rm -f %{buildroot}%{_libdir}/libica.la +rm -f %{buildroot}%{_datadir}/doc/libica/* +rmdir %{buildroot}%{_datadir}/doc/libica -%post +%post tools %{fillup_and_insserv -n boot.z90crypt} -%preun +%preun tools %stop_on_removal boot.z90crypt -%postun +%postun tools %restart_on_update boot.z90crypt %{insserv_cleanup} @@ -148,20 +149,21 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libica.la %files tools %defattr(-, root, root) -%doc README.SUSE COPYING LICENSE +%license LICENSE +%doc README.SUSE %{_initddir}/boot.z90crypt %{_sbindir}/rcz90crypt %attr(0644,root,root) %{_fillupdir}/sysconfig.z90crypt %{_bindir}/icainfo %{_bindir}/icastats -%{_mandir}/man1/icainfo.1.gz -%{_mandir}/man1/icastats.1.gz +%{_mandir}/man1/icainfo.1%{?ext_man} +%{_mandir}/man1/icastats.1%{?ext_man} # Must be in here, otherwise openssl-ibmca does not find it via DSO_load() bsc#952871 %{_libdir}/libica.so %files devel %defattr(-, root, root) -%attr(0644,root,root) /usr/include/ica_api.h +%attr(0644,root,root) %{_includedir}/ica_api.h %files devel-static %defattr(-, root, root)