forked from pool/openCryptoki
4ab3207014
- Upgrade to version 3.19.0 (jsc#PED-616) + openCryptoki 3.19 - CCA: check for expected master key verification patterns at token init - CCA: check master key verification pattern of created keys to be as expected - EP11: check for expected wrapping key verification pattern at token init - EP11: check wrapping key verification pattern of created keys to be as expected - p11sak/pkcsconf: display PKCS#11 URIs - p11sak: add support for IBM specific Dilithium keys - p11sak: allow to list keys filtered by label - common: add support for dual-function cryptographic functions - Add support for C_SessionCancel function (PKCS#11 v3.0) - EP11: add support for schnorr signatures (mechanism CKM_IBM_ECDSA_OTHER) - EP11: add support for Bitcoin key derivation (mechanism CKM_IBM_BTC_DERIVE) - Bug fixes + openCryptoki 3.18 - Default to FIPS compliant token data format (tokversion = 3.12) - Add support for restricting usage of mechanisms and keys via a global policy - Add support for statistics counting of mechanism usage - ICA/EP11: Support libica version 4 - p11sak tool: Allow to set different attributes for public and private keys - Replaced ocki-3.17-remove-make-install-chgrp.patch with an updated version named ocki-3.19-remove-make-install-chgrp.patch to fit the current state of the source. - Removed the following obsolete patches: openCryptoki-sles15-sp4-EP11-Dilithium-Specify-OID-of-key-strength-at-key-ge.patch openCryptoki-sles15-sp4-EP11-Fix-host-library-version-query.patch ocki-3.17-EP11-Fix-C_GetMechanismList-returning-CKR_BUFFER_TOO.patch - Added ocki-3.17-EP11-Fix-C_GetMechanismList-returning-CKR_BUFFER_TOO.patch for bsc#1202106. One test of the gen_purpose test cases fails with C_GetMechanismList #2 rc=CKR_BUFFER_TOO_SMALL" error on the EP11 Token. - Made the following changes for bsc#1199862 "Please install p11sak_defined_attrs.conf." * Replaced ocki-3.11-remove-make-install-chgrp.patch with ocki-3.17-remove-make-install-chgrp.patch to remove the "-g pkcs11" parameter from the install command in the Makefile * Updated the spec file to include /etc/opencryptoki/p11sak_defined_attrs.conf as a %config file with the necessary permissions and group ownership. OBS-URL: https://build.opensuse.org/request/show/1008258 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=124
98 lines
5.7 KiB
Diff
98 lines
5.7 KiB
Diff
--- opencryptoki-3.19.0/Makefile.am 2022-09-30 03:45:52.000000000 -0400
|
|
+++ opencryptoki-3.19.0/Makefile.am 2022-09-30 15:28:53.032877773 -0400
|
|
@@ -61,12 +61,9 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -fs libpkcs11_cca.so PKCS11_CCA.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/ccatok
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/ccatok
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/ccatok
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki || $(MKDIR_P) $(DESTDIR)$(sysconfdir)/opencryptoki || true
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki/ccatok.conf || $(INSTALL) -m 644 $(srcdir)/usr/lib/cca_stdll/ccatok.conf $(DESTDIR)$(sysconfdir)/opencryptoki/ccatok.conf || true
|
|
@@ -75,12 +72,9 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -fs libpkcs11_ep11.so PKCS11_EP11.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/ep11tok
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/ep11tok
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/ep11tok
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki || $(MKDIR_P) $(DESTDIR)$(sysconfdir)/opencryptoki || true
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki/ep11tok.conf || $(INSTALL) -m 644 $(srcdir)/usr/lib/ep11_stdll/ep11tok.conf $(DESTDIR)$(sysconfdir)/opencryptoki/ep11tok.conf || true
|
|
@@ -88,30 +82,24 @@
|
|
endif
|
|
if ENABLE_P11SAK
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki || $(MKDIR_P) $(DESTDIR)$(sysconfdir)/opencryptoki || true
|
|
- test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || $(INSTALL) -g pkcs11 -m 0640 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || true
|
|
+ test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || $(INSTALL) -m 0640 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || true
|
|
endif
|
|
if ENABLE_ICATOK
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -fs libpkcs11_ica.so PKCS11_ICA.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/lite
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/lite
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/lite
|
|
endif
|
|
if ENABLE_SWTOK
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -fs libpkcs11_sw.so PKCS11_SW.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/swtok
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/swtok
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/swtok
|
|
endif
|
|
if ENABLE_TPMTOK
|
|
@@ -119,10 +107,8 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -fs libpkcs11_tpm.so PKCS11_TPM.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/tpm
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/tpm
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/tpm
|
|
endif
|
|
if ENABLE_ICSFTOK
|
|
@@ -130,16 +116,14 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -fs libpkcs11_icsf.so PKCS11_ICSF.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/icsf
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/icsf
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/icsf
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/icsf
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/icsf
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/icsf
|
|
endif
|
|
if ENABLE_DAEMON
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki || $(MKDIR_P) $(DESTDIR)$(sysconfdir)/opencryptoki || true
|
|
test -f $(DESTDIR)$(sysconfdir)/opencryptoki/opencryptoki.conf || $(INSTALL) -m 644 $(srcdir)/usr/sbin/pkcsslotd/opencryptoki.conf $(DESTDIR)$(sysconfdir)/opencryptoki/opencryptoki.conf || true
|
|
- test -f $(DESTDIR)$(sysconfdir)/opencryptoki/strength.conf || $(INSTALL) -m 640 -o root -g pkcs11 -T $(srcdir)/doc/strength-example.conf $(DESTDIR)$(sysconfdir)/opencryptoki/strength.conf || true
|
|
+ test -f $(DESTDIR)$(sysconfdir)/opencryptoki/strength.conf || $(INSTALL) -m 640 -o root -T $(srcdir)/doc/strength-example.conf $(DESTDIR)$(sysconfdir)/opencryptoki/strength.conf || true
|
|
if ENABLE_SYSTEMD
|
|
mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
|
|
cp $(srcdir)/misc/tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/opencryptoki.conf
|
|
@@ -156,7 +140,6 @@
|
|
@echo "Remember you must run ldconfig before using the above settings"
|
|
@echo "--------------------------------------------------------------"
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir) $(DESTDIR)$(logdir)
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir) $(DESTDIR)$(logdir)
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir) $(DESTDIR)$(logdir)
|
|
|
|
|