Accepting request 597615 from home:markkp:branches:devel:openSUSE:Factory

- Added increment-icastats-counter-for-aes-gcm.patch (bsc#1086756)
- Updated boot.z90crypt script to fix a problem with the modprobe
  command not being found. (bsc#1040229).
- Added "Recommends: libica-tools" (bsc#1046435).

OBS-URL: https://build.opensuse.org/request/show/597615
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/libica?expand=0&rev=21

increment-icastats-counter-for-aes-gcm.patch

@@ -0,0 +1,25 @@
+From ae94822a5d949b45d5a5630ff2819b10e55f88d1 Mon Sep 17 00:00:00 2001
+From: Joerg Schmidbauer <jschmidb@de.ibm.com>
+Date: Mon, 13 Nov 2017 15:23:26 +0100
+Subject: [PATCH] Bugfix: Increment icastats counter for AES-GCM.
+ Signed-off-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
+
+---
+ 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;

libica-SuSE.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c5f6175d3daec01408b803c5781259320c5ba03cad2f15cced2ffef105b4158
-size 1944
+oid sha256:bf0689e700d8c1d000e49843239f37ae75708e46707c8e5447da9946df37368c
+size 2216

libica.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr 18 02:29:29 UTC 2018 - mpost@suse.com
+
+- Added increment-icastats-counter-for-aes-gcm.patch (bsc#1086756)
+- Updated boot.z90crypt script to fix a problem with the modprobe
+  command not being found. (bsc#1040229).
+- Added "Recommends: libica-tools" (bsc#1046435).
+
 -------------------------------------------------------------------
 Thu Nov 23 13:53:22 UTC 2017 - rbrown@suse.com
 

libica.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libica
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -40,6 +40,7 @@ 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
@@ -54,6 +55,7 @@ modules to interface with the IBM eServer Cryptographic Accelerator
 %package -n libica3
 Summary:        Library interface for the IBM Cryptographic Accelerator
 Group:          System/Libraries
+Recommends:     libica-tools
 
 %description -n libica3
 This package contains the interface library routines used by IBM
@@ -104,6 +106,7 @@ the libica library.
 
 %prep
 %setup -a 1
+%patch1 -p1
 
 %build
 mkdir -p include/linux/