.gitignore

@@ -1 +1,2 @@
-SOURCES/libica-4.2.3.tar.gz
+/libica-*.tgz
+/libica-*.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.beaker-tier1-gating.functional}

libica-4.1.1-revert-abi.patch

@@ -1,4 +1,4 @@
-From 2945363230c1d76d21327e12995a8789ec9df514 Mon Sep 17 00:00:00 2001
+From 8f05d0eb92956c2e3e6dce529be9292906beeef8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
 Date: Tue, 22 Mar 2022 12:43:19 +0100
 Subject: [libica PATCH 1/2] Revert "Remove deprecated API functions"
@@ -23,7 +23,7 @@ This reverts commit 4a3a77232ee85cf9f4eb7ac2d366b613013b9048.
  create mode 100644 test/tdes_test.c
 
 diff --git a/include/ica_api.h b/include/ica_api.h
-index 0263d2f..8f7bbdb 100644
+index 99e624f..9b3f14b 100644
 --- a/include/ica_api.h
 +++ b/include/ica_api.h
 @@ -1480,6 +1480,227 @@ unsigned int ica_rsa_crt(ica_adapter_handle_t adapter_handle,
@@ -271,7 +271,7 @@ index 0263d2f..8f7bbdb 100644
   * Return libica build information.
   *
 diff --git a/libica.map b/libica.map
-index 0a64d4c..0a71832 100644
+index 4c4ce1f..df6aef4 100644
 --- a/libica.map
 +++ b/libica.map
 @@ -3,11 +3,15 @@ LIBICA_3.0.0 {
@@ -309,7 +309,7 @@ index 0a64d4c..0a71832 100644
  	ica_aes_cbc;
  	ica_aes_cbc_cs;
 diff --git a/src/ica_api.c b/src/ica_api.c
-index 42d9baf..3e13a29 100644
+index c9ea1ad..257a8c5 100644
 --- a/src/ica_api.c
 +++ b/src/ica_api.c
 @@ -2452,6 +2452,264 @@ int ica_ed448_key_gen(ICA_ED448_CTX *ctx)
@@ -578,7 +578,7 @@ index 42d9baf..3e13a29 100644
  			 unsigned long data_length, unsigned char *key,
  			 unsigned int direction)
 diff --git a/src/include/s390_crypto.h b/src/include/s390_crypto.h
-index 49cbb09..76f530f 100644
+index f34241f..d708e8f 100644
 --- a/src/include/s390_crypto.h
 +++ b/src/include/s390_crypto.h
 @@ -30,11 +30,6 @@ int s390_get_fips_indicator(libica_fips_indicator_element *fips_list,
@@ -594,7 +594,7 @@ index 49cbb09..76f530f 100644
      #if defined(OPENSSL_VERSION_MAJOR) && defined(OPENSSL_VERSION_MINOR)
          #define OPENSSL_VERSION_PREREQ(maj, min)        \
 diff --git a/test/Makefile.am b/test/Makefile.am
-index f220205..f756597 100644
+index dddfc90..bc6b9fd 100644
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
 @@ -7,16 +7,21 @@ get_version_test \
@@ -1578,10 +1578,10 @@ index 0000000..bfa33c2
 +}
 +
 -- 
-2.38.1
+2.40.1
 
 
-From 740531ec03c7dd79e185136b0b1970aa1cd1d924 Mon Sep 17 00:00:00 2001
+From 234a63495a2f9d5170d49b8f5d11cd3ac6056fde Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
 Date: Tue, 25 Oct 2022 13:54:11 +0200
 Subject: [libica PATCH 2/2] add back fips_check_3des_key()
@@ -1593,7 +1593,7 @@ a function that's required by the previously reverted code.
  1 file changed, 10 insertions(+)
 
 diff --git a/src/ica_api.c b/src/ica_api.c
-index 3e13a29..1bd81bb 100644
+index 257a8c5..9564610 100644
 --- a/src/ica_api.c
 +++ b/src/ica_api.c
 @@ -93,6 +93,16 @@ void ica_set_stats_mode(int stats_mode)
@@ -1614,5 +1614,5 @@ index 3e13a29..1bd81bb 100644
  static unsigned int check_des_parms(unsigned int mode,
  				    unsigned long data_length,
 -- 
-2.38.1
+2.40.1
 

libica-4.2.2-icastats-summary.patch

@@ -0,0 +1,231 @@
+From f09f1d0b48f3bf541f1300716fa5bdbbbe80a4a1 Mon Sep 17 00:00:00 2001
+From: Ingo Franzki <ifranzki@linux.ibm.com>
+Date: Tue, 18 Jul 2023 09:21:54 +0200
+Subject: [libica PATCH] icastats: Fix summary option to display correct
+ summary information
+
+The '--summary' option of icastats did not display correct statistics since
+the introduction of per key keysize counters with libica version 4.0.0.
+
+To display the correct summary counters, the all-key-size-counter values of an
+algorithm that supports multiple key sizes must be calculated like it is done
+in get_stats_data(). Adjust get_stats_data() function and friends so that it
+now also can be called from get_stats_sum() and can optionally operate on a
+specified statistics segment (i.e. the one where the summary statistics have
+been calculated in), not just the global one.
+
+Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
+---
+ src/icastats.c         |   4 +-
+ src/icastats_shared.c  | 102 +++++++++++++++++++++++------------------
+ src/include/icastats.h |   5 +-
+ 3 files changed, 62 insertions(+), 49 deletions(-)
+
+diff --git a/src/icastats.c b/src/icastats.c
+index e98617f..07b0d50 100644
+--- a/src/icastats.c
++++ b/src/icastats.c
+@@ -302,7 +302,7 @@ int main(int argc, char *argv[])
+ 				perror("malloc: ");
+ 				return EXIT_FAILURE;
+ 			}
+-			get_stats_data(entries);
++			get_stats_data(NULL, entries);
+ 			if (json) {
+ 				print_stats_json(entries, usr);
+ 			} else {
+@@ -358,7 +358,7 @@ int main(int argc, char *argv[])
+ 			perror("malloc: ");
+ 			return EXIT_FAILURE;
+ 		}
+-		get_stats_data(stats);
++		get_stats_data(NULL, stats);
+ 		if (json) {
+ 			pswd = getpwuid(user == -1 ? geteuid() : (uid_t)user);
+ 			if (pswd == NULL) {
+diff --git a/src/icastats_shared.c b/src/icastats_shared.c
+index 8290239..f8e8563 100644
+--- a/src/icastats_shared.c
++++ b/src/icastats_shared.c
+@@ -124,39 +124,46 @@ void stats_munmap(int user, int unlink)
+  * @direction - valid values are ENCRYPT and DECRYPT
+  */
+ 
+-uint64_t stats_query(stats_fields_t field, int hardware, int direction)
++uint64_t stats_query(stats_entry_t *source, stats_fields_t field,
++		     int hardware, int direction)
+ {
+-	if (stats == NULL)
++	if (source == NULL)
++		source = stats;
++
++	if (source == NULL)
+ 		return 0;
+ 
+ 	if (direction == ENCRYPT)
+ 		if (hardware == ALGO_HW)
+-			return stats[field].enc.hw;
++			return source[field].enc.hw;
+ 		else
+-			return stats[field].enc.sw;
++			return source[field].enc.sw;
+ 	else
+ 		if (hardware == ALGO_HW)
+-			return stats[field].dec.hw;
++			return source[field].dec.hw;
+ 		else
+-			return stats[field].dec.sw;
++			return source[field].dec.sw;
+ }
+ 
+-static uint64_t calc_summary(stats_fields_t start, unsigned int num,
++static uint64_t calc_summary(stats_entry_t *source,
++		             stats_fields_t start, unsigned int num,
+ 		             int hardware, int direction)
+ {
+ 	unsigned int i;
+ 	uint64_t sum = 0;
+ 
+ 	for (i = 0; i < num; i++)
+-		sum += stats_query(start + i, hardware, direction);
++		sum += stats_query(source, start + i, hardware, direction);
+ 
+ 	return sum;
+ }
+ 
+ /* Returns the statistic data in a stats_entry_t array
++ * @source - source of the statistics data. If NULL, then the global stats
++ *           are used, which must have been mapped via stats_mmap() before.
+  * @entries - Needs to be a array of size ICA_NUM_STATS.
+  */
+-void get_stats_data(stats_entry_t *entries)
++void get_stats_data(stats_entry_t *source, stats_entry_t *entries)
+ {
+ 	unsigned int i;
+ 	for (i = 0; i < ICA_NUM_STATS; i++) {
+@@ -168,58 +175,62 @@ void get_stats_data(stats_entry_t *entries)
+ 		case ICA_STATS_AES_CTR:
+ 		case ICA_STATS_AES_CMAC:
+ 		case ICA_STATS_AES_GCM:
+-			entries[i].enc.hw = calc_summary(i + 1, 3,
+-					                 ALGO_HW, ENCRYPT);
+-			entries[i].enc.sw = calc_summary(i + 1, 3,
+-					                 ALGO_SW, ENCRYPT);
+-			entries[i].dec.hw = calc_summary(i + 1, 3,
+-					                 ALGO_HW, DECRYPT);
+-			entries[i].dec.sw = calc_summary(i + 1, 3,
+-					                 ALGO_SW, DECRYPT);
++			entries[i].enc.hw = calc_summary(source, i + 1, 3,
++							 ALGO_HW, ENCRYPT);
++			entries[i].enc.sw = calc_summary(source, i + 1, 3,
++							 ALGO_SW, ENCRYPT);
++			entries[i].dec.hw = calc_summary(source, i + 1, 3,
++							 ALGO_HW, DECRYPT);
++			entries[i].dec.sw = calc_summary(source, i + 1, 3,
++							 ALGO_SW, DECRYPT);
+ 			break;
+ 
+ 		case ICA_STATS_AES_XTS:
+-			entries[i].enc.hw = calc_summary(i + 1, 2,
+-					                 ALGO_HW, ENCRYPT);
+-			entries[i].enc.sw = calc_summary(i + 1, 2,
+-					                 ALGO_SW, ENCRYPT);
+-			entries[i].dec.hw = calc_summary(i + 1, 2,
+-					                 ALGO_HW, DECRYPT);
+-			entries[i].dec.sw = calc_summary(i + 1, 2,
+-					                 ALGO_SW, DECRYPT);
++			entries[i].enc.hw = calc_summary(source, i + 1, 2,
++							 ALGO_HW, ENCRYPT);
++			entries[i].enc.sw = calc_summary(source, i + 1, 2,
++							 ALGO_SW, ENCRYPT);
++			entries[i].dec.hw = calc_summary(source, i + 1, 2,
++							 ALGO_HW, DECRYPT);
++			entries[i].dec.sw = calc_summary(source, i + 1, 2,
++							 ALGO_SW, DECRYPT);
+ 			break;
+ 
+ 		case ICA_STATS_RSA_ME:
+ 		case ICA_STATS_RSA_CRT:
+-			entries[i].enc.hw = calc_summary(i + 1, 4,
+-					                 ALGO_HW, ENCRYPT);
+-			entries[i].enc.sw = calc_summary(i + 1, 4,
+-					                 ALGO_SW, ENCRYPT);
+-			entries[i].dec.hw = calc_summary(i + 1, 4,
+-					                 ALGO_HW, DECRYPT);
+-			entries[i].dec.sw = calc_summary(i + 1, 4,
+-					                 ALGO_SW, DECRYPT);
++			entries[i].enc.hw = calc_summary(source, i + 1, 4,
++							 ALGO_HW, ENCRYPT);
++			entries[i].enc.sw = calc_summary(source, i + 1, 4,
++							 ALGO_SW, ENCRYPT);
++			entries[i].dec.hw = calc_summary(source, i + 1, 4,
++							 ALGO_HW, DECRYPT);
++			entries[i].dec.sw = calc_summary(source, i + 1, 4,
++							 ALGO_SW, DECRYPT);
+ 			break;
+ 
+ 		case ICA_STATS_ECDH:
+ 		case ICA_STATS_ECDSA_SIGN:
+ 		case ICA_STATS_ECDSA_VERIFY:
+ 		case ICA_STATS_ECKGEN:
+-			entries[i].enc.hw = calc_summary(i + 1, 8,
+-					                 ALGO_HW, ENCRYPT);
+-			entries[i].enc.sw = calc_summary(i + 1, 8,
+-					                 ALGO_SW, ENCRYPT);
+-			entries[i].dec.hw = calc_summary(i + 1, 8,
+-					                 ALGO_HW, DECRYPT);
+-			entries[i].dec.sw = calc_summary(i + 1, 8,
+-					                 ALGO_SW, DECRYPT);
++			entries[i].enc.hw = calc_summary(source, i + 1, 8,
++							 ALGO_HW, ENCRYPT);
++			entries[i].enc.sw = calc_summary(source, i + 1, 8,
++							 ALGO_SW, ENCRYPT);
++			entries[i].dec.hw = calc_summary(source, i + 1, 8,
++							 ALGO_HW, DECRYPT);
++			entries[i].dec.sw = calc_summary(source, i + 1, 8,
++							 ALGO_SW, DECRYPT);
+ 			break;
+ 
+ 		default:
+-			entries[i].enc.hw = stats_query(i, ALGO_HW, ENCRYPT);
+-			entries[i].enc.sw = stats_query(i, ALGO_SW, ENCRYPT);
+-			entries[i].dec.hw = stats_query(i, ALGO_HW, DECRYPT);
+-			entries[i].dec.sw = stats_query(i, ALGO_SW, DECRYPT);
++			entries[i].enc.hw = stats_query(source, i,
++							ALGO_HW, ENCRYPT);
++			entries[i].enc.sw = stats_query(source, i,
++							ALGO_SW, ENCRYPT);
++			entries[i].dec.hw = stats_query(source, i,
++							ALGO_HW, DECRYPT);
++			entries[i].dec.sw = stats_query(source, i,
++							ALGO_SW, DECRYPT);
+ 			break;
+ 		}
+ 	}
+@@ -280,6 +291,7 @@ int get_stats_sum(stats_entry_t *sum)
+ 		}
+ 	}
+ 	closedir(shmDir);
++	get_stats_data(sum, sum);
+ 	return 1;
+ }
+ 
+diff --git a/src/include/icastats.h b/src/include/icastats.h
+index f1d70ba..136ac0f 100644
+--- a/src/include/icastats.h
++++ b/src/include/icastats.h
+@@ -286,8 +286,9 @@ typedef enum stats_fields {
+ 
+ int stats_mmap(int user);
+ void stats_munmap(int user, int unlink);
+-uint64_t stats_query(stats_fields_t field, int hardware, int direction);
+-void get_stats_data(stats_entry_t *entries);
++uint64_t stats_query(stats_entry_t *source, stats_fields_t field,
++		     int hardware, int direction);
++void get_stats_data(stats_entry_t *source, stats_entry_t *entries);
+ void stats_increment(stats_fields_t field, int hardware, int direction);
+ int get_stats_sum(stats_entry_t *sum);
+ char *get_next_usr();
+-- 
+2.40.1
+

sources

@@ -0,0 +1 @@
+SHA512 (libica-4.2.3.tar.gz) = c370151bfddf58f397932b294394e50db3f6c61a2114315ba3176b8aaeb34253561192c717ca01185371715e9f008fa0ceee8e7ffc559377a51a67f4d47ae035