From 6ad77309ccff05ad4a9f568305dace2e8f7af02c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 6 Apr 2022 13:04:28 +0200 Subject: [PATCH] add tokversion --- opencryptoki-3.17-tokversion.patch | 34 ++++++++++++++++++++++++++++++ opencryptoki.spec | 6 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 opencryptoki-3.17-tokversion.patch diff --git a/opencryptoki-3.17-tokversion.patch b/opencryptoki-3.17-tokversion.patch new file mode 100644 index 0000000..7b6f0fd --- /dev/null +++ b/opencryptoki-3.17-tokversion.patch @@ -0,0 +1,34 @@ +diff -up opencryptoki-3.17.0/usr/sbin/pkcsslotd/opencryptoki.conf.me opencryptoki-3.17.0/usr/sbin/pkcsslotd/opencryptoki.conf +--- opencryptoki-3.17.0/usr/sbin/pkcsslotd/opencryptoki.conf.me 2022-04-06 06:46:43.905040507 -0400 ++++ opencryptoki-3.17.0/usr/sbin/pkcsslotd/opencryptoki.conf 2022-04-06 06:47:51.375040507 -0400 +@@ -22,25 +22,30 @@ version opencryptoki-3.17 + slot 0 + { + stdll = libpkcs11_tpm.so ++tokversion = 3.12 + } + + slot 1 + { + stdll = libpkcs11_ica.so ++tokversion = 3.12 + } + + slot 2 + { + stdll = libpkcs11_cca.so ++tokversion = 3.12 + } + + slot 3 + { + stdll = libpkcs11_sw.so ++tokversion = 3.12 + } + + slot 4 + { + stdll = libpkcs11_ep11.so ++tokversion = 3.12 + confname = ep11tok.conf + } diff --git a/opencryptoki.spec b/opencryptoki.spec index 4dd3e6a..1af311f 100644 --- a/opencryptoki.spec +++ b/opencryptoki.spec @@ -1,7 +1,7 @@ Name: opencryptoki Summary: Implementation of the PKCS#11 (Cryptoki) specification v3.0 Version: 3.17.0 -Release: 5%{?dist} +Release: 6%{?dist} License: CPL URL: https://github.com/opencryptoki/opencryptoki Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -21,6 +21,7 @@ Patch3: opencryptoki-3.17.0-covscan.patch Patch300: opencryptoki-pkcsslotd-pidfile.patch Patch301: opencryptoki-3.17-avoid-deadlock-when-stopping-event-thread.patch Patch302: opencryptoki-3.17.0-openssl-cleanup-for-opencryptoki.patch +Patch303: opencryptoki-3.17-tokversion.patch Requires(pre): coreutils Requires: (selinux-policy >= 34.9-1 if selinux-policy-targeted) @@ -330,6 +331,9 @@ fi %changelog +* Wed Apr 06 2022 Than Ngo - 3.17.0-6 +- add tokversion + * Wed Apr 06 2022 Than Ngo - 3.17.0-5 - upstream fixes - openssl cleanup for opencryptoki, Avoid deadlock when stopping event thread