rpms/libica
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import libica-3.6.1-2.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-04-28 05:41:10 -04:00 committed by Stepan Oksanichenko
parent 2496a2b110
commit 9745d83533
5 changed files with 221 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libica-3.5.0.tar.gz
SOURCES/libica-3.6.1.tar.gz

2
.libica.metadata
View File

@ -1 +1 @@
60a762b6e1d55d8794b82eab3caee7a74204ed46 SOURCES/libica-3.5.0.tar.gz
e4ed7750d1b296f1866275467fbbf9e368d579f5 SOURCES/libica-3.6.1.tar.gz

2
SOURCES/libica-3.3.3-annotate.patch
View File

@ -4,7 +4,7 @@ diff -up libica-3.3.3/src/Makefile.am.annotate libica-3.3.3/src/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libica.la
libica_la_CFLAGS = ${AM_CFLAGS} -I${srcdir}/include -I${srcdir}/../include \
-fvisibility=hidden
-fvisibility=hidden -pthread
-libica_la_CCASFLAGS = ${AM_CFLAGS}
+libica_la_CCASFLAGS = ${AM_CFLAGS} -Wa,--generate-missing-build-notes=yes
libica_la_LIBADD = @LIBS@ -lrt -lcrypto

201
SOURCES/libica-3.6.1-counter.patch Normal file
View File

@ -0,0 +1,201 @@
From 58c1073a585443146332c5a3b5536eb5e6c6493d Mon Sep 17 00:00:00 2001
From: Joerg Schmidbauer <jschmidb@de.ibm.com>
Date: Wed, 27 Nov 2019 15:54:29 +0100
Subject: [PATCH] Fix icastats counter format
icastats counters displayed negative numbers for counts
higher than 31 bits in size. Now using 64-bit unsigned values.
Signed-off-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
---
src/icastats.c | 18 +++++++++---------
src/icastats_shared.c | 32 ++++++++++++++++----------------
src/include/icastats.h | 6 +++---
test/icastats_test.c | 10 +++++-----
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/icastats.c b/src/icastats.c
index 3896ad1..fa1dcff 100644
--- a/src/icastats.c
+++ b/src/icastats.c
@@ -10,7 +10,7 @@
* Benedikt Klotz <benedikt.klotz@de.ibm.com>
* Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
*
- * Copyright IBM Corp. 2009, 2010, 2011, 2014
+ * Copyright IBM Corp. 2009-2019
*/
#include <stdio.h>
@@ -24,7 +24,7 @@
#include "icastats.h"
#define CMD_NAME "icastats"
-#define COPYRIGHT "Copyright IBM Corp. 2009, 2010, 2011, 2014."
+#define COPYRIGHT "Copyright IBM Corp. 2009-2019"
void print_version(void)
{
@@ -69,24 +69,24 @@ const char *const STATS_DESC[ICA_NUM_STATS] = {
-#define CELL_SIZE 10
+#define CELL_SIZE 12
void print_stats(stats_entry_t *stats)
{
- printf(" function | hardware | software\n");
- printf("----------------+--------------------------+-------------------------\n");
- printf(" | ENC CRYPT DEC | ENC CRYPT DEC \n");
- printf("----------------+--------------------------+-------------------------\n");
+ printf(" function | hardware | software\n");
+ printf("----------------+------------------------------+-----------------------------\n");
+ printf(" | ENC CRYPT DEC | ENC CRYPT DEC \n");
+ printf("----------------+------------------------------+-----------------------------\n");
unsigned int i;
for (i = 0; i < ICA_NUM_STATS; ++i){
if(i<=ICA_STATS_RSA_CRT){
- printf(" %14s | %*d | %*d\n",
+ printf(" %14s | %*lu | %*lu\n",
STATS_DESC[i],
CELL_SIZE,
stats[i].enc.hw,
CELL_SIZE,
stats[i].enc.sw);
} else{
- printf(" %14s |%*d %*d |%*d %*d\n",
+ printf(" %14s |%*lu %*lu |%*lu %*lu\n",
STATS_DESC[i],
CELL_SIZE,
stats[i].enc.hw,
diff --git a/src/icastats_shared.c b/src/icastats_shared.c
index ecd9c59..f3b24d9 100644
--- a/src/icastats_shared.c
+++ b/src/icastats_shared.c
@@ -34,18 +34,18 @@ static stats_entry_t *stats = NULL;
volatile int stats_shm_handle = NOT_INITIALIZED;
-static inline void atomic_add(int *x, int i)
+static inline void atomic_add(uint64_t *x, uint64_t i)
{
- int old;
- int new;
- asm volatile (" l %0,%2\n"
- "0: lr %1,%0\n"
- " ar %1,%3\n"
- " cs %0,%1,%2\n"
- " jl 0b"
- :"=&d" (old), "=&d"(new), "=Q"(*x)
- :"d"(i), "Q"(*x)
- :"cc", "memory");
+ uint64_t old;
+ uint64_t new;
+ asm volatile (" lg %0,%2\n"
+ "0: lgr %1,%0\n"
+ " agr %1,%3\n"
+ " csg %0,%1,%2\n"
+ " jl 0b"
+ :"=&d" (old), "=&d"(new), "=Q"(*x)
+ :"d"(i), "Q"(*x)
+ :"cc", "memory");
}
@@ -125,7 +125,7 @@ void stats_munmap(int unlink)
* @direction - valid values are ENCRYPT and DECRYPT
*/
-uint32_t stats_query(stats_fields_t field, int hardware, int direction)
+uint64_t stats_query(stats_fields_t field, int hardware, int direction)
{
if (stats == NULL)
return 0;
@@ -277,14 +277,14 @@ void stats_increment(stats_fields_t field, int hardware, int direction)
if(direction == ENCRYPT)
if (hardware == ALGO_HW)
- atomic_add((int *)&stats[field].enc.hw, 1);
+ atomic_add(&stats[field].enc.hw, 1);
else
- atomic_add((int *)&stats[field].enc.sw, 1);
+ atomic_add(&stats[field].enc.sw, 1);
else
if (hardware == ALGO_HW)
- atomic_add((int *)&stats[field].dec.hw, 1);
+ atomic_add(&stats[field].dec.hw, 1);
else
- atomic_add((int *)&stats[field].dec.sw, 1);
+ atomic_add(&stats[field].dec.sw, 1);
}
#endif
diff --git a/src/include/icastats.h b/src/include/icastats.h
index 53af8ba..f373263 100644
--- a/src/include/icastats.h
+++ b/src/include/icastats.h
@@ -18,8 +18,8 @@
typedef struct crypt_opts{
- uint32_t hw;
- uint32_t sw;
+ uint64_t hw;
+ uint64_t sw;
} crypt_opts_t;
typedef struct statis_entry {
@@ -159,7 +159,7 @@ typedef enum stats_fields {
int stats_mmap(int user);
void stats_munmap(int unlink);
-uint32_t stats_query(stats_fields_t field, int hardware, int direction);
+uint64_t stats_query(stats_fields_t field, int hardware, int direction);
void get_stats_data(stats_entry_t *entries);
void stats_increment(stats_fields_t field, int hardware, int direction);
int get_stats_sum(stats_entry_t *sum);
diff --git a/test/icastats_test.c b/test/icastats_test.c
index 4527d48..c7ac447 100644
--- a/test/icastats_test.c
+++ b/test/icastats_test.c
@@ -239,7 +239,7 @@ void check_icastats(int algo_id, char *stat)
char cmd[256], line[256], *p;
FILE *f;
int i, hw, rc=-1, counters=0;
- int hwcounter1=0, hwcounter2=0, swcounter1=0, swcounter2=0;
+ uint64_t hwcounter1=0, hwcounter2=0, swcounter1=0, swcounter2=0;
hw = check_hw(algo_id);
if (hw < 0) return; /* unknown algo_id */
@@ -267,13 +267,13 @@ void check_icastats(int algo_id, char *stat)
if (!p) goto out; /* no | in the output. Wrong algo string ? */
p++;
while (isspace(*p)) p++;
- hwcounter1 = atoi(p); /* parse 1st hw counter value */
+ hwcounter1 = atol(p); /* parse 1st hw counter value */
counters++;
while (*p && !isspace(*p)) p++; /* parse over counter value */
while (isspace(*p)) p++;
/* now either a | or another counter value follows */
if (isdigit(*p)) {
- hwcounter2 = atoi(p); /* parse 2nd hw counter value */
+ hwcounter2 = atol(p); /* parse 2nd hw counter value */
counters++;
while (*p && !isspace(*p)) p++; /* parse over counter value */
while (isspace(*p)) p++;
@@ -285,13 +285,13 @@ void check_icastats(int algo_id, char *stat)
}
p++;
while (isspace(*p)) p++;
- swcounter1 = atoi(p); /* parse 1st sw counter value */
+ swcounter1 = atol(p); /* parse 1st sw counter value */
counters++;
while (*p && !isspace(*p)) p++; /* parse over counter value */
while (isspace(*p)) p++;
/* maybe another counter value follows */
if (isdigit(*p)) {
- swcounter2 = atoi(p); /* parse 2nd sw counter value */
+ swcounter2 = atol(p); /* parse 2nd sw counter value */
counters++;
}

19
SPECS/libica.spec
View File

@ -1,7 +1,7 @@
Summary: Library for accessing ICA hardware crypto on IBM z Systems
Name: libica
Version: 3.5.0
Release: 1%{?dist}
Version: 3.6.1
Release: 2%{?dist}
License: CPL
Group: System Environment/Libraries
URL: https://github.com/opencryptoki/
@ -9,6 +9,9 @@ Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{v
# annotate assembler source
# https://bugzilla.redhat.com/show_bug.cgi?id=1630582
Patch1: %{name}-3.3.3-annotate.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1789052
# https://github.com/opencryptoki/libica/commit/58c1073a585443146332c5a3b5536eb5e6c6493d
Patch2: %{name}-3.6.1-counter.patch
BuildRequires: gcc
BuildRequires: openssl-devel
BuildRequires: autoconf
@ -77,6 +80,18 @@ fi
%changelog
* Thu Jan 09 2020 Dan Horák <dhorak@redhat.com> - 3.6.1-2
- fix overflow in icastats counters (#1789052)
- Resolves: #1789052
* Tue Nov 26 2019 Dan Horák <dhorak@redhat.com> - 3.6.1-1
- updated to 3.6.1 (#1772402)
- Resolves: #1772402
* Tue Nov 05 2019 Dan Horák <dhorak@redhat.com> - 3.6.0-1
- updated to 3.6.0 (#1726244)
- Resolves: #1726244, #1723862
* Wed Apr 24 2019 Dan Horák <dhorak@redhat.com> - 3.5.0-1
- updated to 3.5.0 (#1666621)
- Resolves: #1666621, #1659428, #1673054