Compare commits
No commits in common. 'c9' and 'c8-beta-stream-client' have entirely different histories.
c9
...
c8-beta-st
@ -1 +1,2 @@
|
|||||||
SOURCES/softhsm-2.6.1.tar.gz
|
SOURCES/softhsm-2.6.0.tar.gz
|
||||||
|
SOURCES/softhsm-2.6.0.tar.gz.sig
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
c6fd316df6366960b8c8cda92408d7e02c3fb434 SOURCES/softhsm-2.6.1.tar.gz
|
da4220189c358741a42a63442561ec07996badaf SOURCES/softhsm-2.6.0.tar.gz
|
||||||
|
9cf81d11bb957120f9cf8be6de1d429baca09215 SOURCES/softhsm-2.6.0.tar.gz.sig
|
||||||
|
|||||||
@ -0,0 +1,230 @@
|
|||||||
|
From cfe1f7fdd12e202fa2d056c7fd731cfeee378a98 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jakub Jelen <jjelen@redhat.com>
|
||||||
|
Date: Wed, 15 Jul 2020 18:12:32 +0200
|
||||||
|
Subject: [PATCH] Unbreak negative mechanism lists in slots.mechanisms +
|
||||||
|
testcase
|
||||||
|
|
||||||
|
Previously, when the list for slots.mechanisms was prefixed with
|
||||||
|
minus sign "-", the first mechanism was skipped as invalid and
|
||||||
|
therefore the tool was presenting wrong list of algorithms.
|
||||||
|
|
||||||
|
This fixes the initial index for selection of first algorithm
|
||||||
|
and adds unit test for this scenario.
|
||||||
|
---
|
||||||
|
.gitignore | 1 +
|
||||||
|
configure.ac | 1 +
|
||||||
|
src/lib/SoftHSM.cpp | 9 ++-
|
||||||
|
src/lib/test/InfoTests.cpp | 70 ++++++++++++++++++-
|
||||||
|
src/lib/test/InfoTests.h | 2 +
|
||||||
|
src/lib/test/Makefile.am | 1 +
|
||||||
|
src/lib/test/softhsm2-negative-mech.conf.in | 8 +++
|
||||||
|
.../test/softhsm2-negative-mech.conf.win32 | 7 ++
|
||||||
|
win32/p11test/p11test.vcxproj.in | 2 +
|
||||||
|
9 files changed, 97 insertions(+), 4 deletions(-)
|
||||||
|
create mode 100644 src/lib/test/softhsm2-negative-mech.conf.in
|
||||||
|
create mode 100644 src/lib/test/softhsm2-negative-mech.conf.win32
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index d4dad435..c6a51c7a 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -217,6 +217,7 @@ AC_CONFIG_FILES([
|
||||||
|
src/lib/test/softhsm2-alt.conf
|
||||||
|
src/lib/test/softhsm2-reset-on-fork.conf
|
||||||
|
src/lib/test/softhsm2-mech.conf
|
||||||
|
+ src/lib/test/softhsm2-negative-mech.conf
|
||||||
|
src/lib/test/tokens/dummy
|
||||||
|
src/bin/Makefile
|
||||||
|
src/bin/common/Makefile
|
||||||
|
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
|
||||||
|
index 0a0c32cc..cac724e6 100644
|
||||||
|
--- a/src/lib/SoftHSM.cpp
|
||||||
|
+++ b/src/lib/SoftHSM.cpp
|
||||||
|
@@ -791,12 +791,17 @@ void SoftHSM::prepareSupportedMecahnisms(std::map<std::string, CK_MECHANISM_TYPE
|
||||||
|
if (mechs != "ALL")
|
||||||
|
{
|
||||||
|
bool negative = (mechs[0] == '-');
|
||||||
|
- if (!negative)
|
||||||
|
+ size_t pos = 0, prev = 0;
|
||||||
|
+ if (negative)
|
||||||
|
+ {
|
||||||
|
+ /* Skip the minus sign */
|
||||||
|
+ prev = 1;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
{
|
||||||
|
/* For positive list, we remove everything */
|
||||||
|
supportedMechanisms.clear();
|
||||||
|
}
|
||||||
|
- size_t pos = 0, prev = 0;
|
||||||
|
std::string token;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
diff --git a/src/lib/test/InfoTests.cpp b/src/lib/test/InfoTests.cpp
|
||||||
|
index a07956fb..d2218e34 100644
|
||||||
|
--- a/src/lib/test/InfoTests.cpp
|
||||||
|
+++ b/src/lib/test/InfoTests.cpp
|
||||||
|
@@ -328,9 +328,9 @@ void InfoTests::testGetMechanismListConfig()
|
||||||
|
CK_MECHANISM_TYPE_PTR pMechanismList;
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
- setenv("SOFTHSM2_CONF", "./softhsm2-mech.conf", 1);
|
||||||
|
+ setenv("SOFTHSM2_CONF", "./softhsm2-mech.conf", 1);
|
||||||
|
#else
|
||||||
|
- setenv("SOFTHSM2_CONF", ".\\softhsm2-mech.conf", 1);
|
||||||
|
+ setenv("SOFTHSM2_CONF", ".\\softhsm2-mech.conf", 1);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Just make sure that we finalize any previous failed tests
|
||||||
|
@@ -363,6 +363,72 @@ void InfoTests::testGetMechanismListConfig()
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+void InfoTests::testGetMechanismNegativeListConfig()
|
||||||
|
+{
|
||||||
|
+ CK_RV rv;
|
||||||
|
+ CK_ULONG ulMechCount = 0;
|
||||||
|
+ CK_MECHANISM_TYPE_PTR pMechanismList;
|
||||||
|
+ CK_ULONG allMechsCount = 0;
|
||||||
|
+
|
||||||
|
+ // Just make sure that we finalize any previous failed tests
|
||||||
|
+ CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
|
||||||
|
+
|
||||||
|
+ // First of all, try to get the default list
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_GetMechanismList(m_initializedTokenSlotID, NULL_PTR, &ulMechCount) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_CRYPTOKI_NOT_INITIALIZED);
|
||||||
|
+
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_Initialize(NULL_PTR) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_OK);
|
||||||
|
+
|
||||||
|
+ // Get the size of the buffer
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_GetMechanismList(m_initializedTokenSlotID, NULL_PTR, &ulMechCount) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_OK);
|
||||||
|
+ pMechanismList = (CK_MECHANISM_TYPE_PTR)malloc(ulMechCount * sizeof(CK_MECHANISM_TYPE_PTR));
|
||||||
|
+ /* Remember how many mechanisms are supported */
|
||||||
|
+ allMechsCount = ulMechCount;
|
||||||
|
+
|
||||||
|
+ // Get the mechanism list
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_GetMechanismList(m_initializedTokenSlotID, pMechanismList, &ulMechCount) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_OK);
|
||||||
|
+ CPPUNIT_ASSERT_EQUAL(allMechsCount, ulMechCount);
|
||||||
|
+ free(pMechanismList);
|
||||||
|
+
|
||||||
|
+ CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
|
||||||
|
+ /* Now try with configuration having negative list */
|
||||||
|
+#ifndef _WIN32
|
||||||
|
+ setenv("SOFTHSM2_CONF", "./softhsm2-negative-mech.conf", 1);
|
||||||
|
+#else
|
||||||
|
+ setenv("SOFTHSM2_CONF", ".\\softhsm2-negative-mech.conf", 1);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_Initialize(NULL_PTR) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_OK);
|
||||||
|
+
|
||||||
|
+ // Get the size of the buffer
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_GetMechanismList(m_initializedTokenSlotID, NULL_PTR, &ulMechCount) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_OK);
|
||||||
|
+ /* We should get 2 shorter */
|
||||||
|
+ //CPPUNIT_ASSERT_EQUAL(allMechsCount - 2, ulMechCount);
|
||||||
|
+ pMechanismList = (CK_MECHANISM_TYPE_PTR)malloc(ulMechCount * sizeof(CK_MECHANISM_TYPE_PTR));
|
||||||
|
+
|
||||||
|
+ // Get the mechanism list
|
||||||
|
+ rv = CRYPTOKI_F_PTR( C_GetMechanismList(m_initializedTokenSlotID, pMechanismList, &ulMechCount) );
|
||||||
|
+ CPPUNIT_ASSERT(rv == CKR_OK);
|
||||||
|
+ //CPPUNIT_ASSERT_EQUAL(allMechsCount - 2, ulMechCount);
|
||||||
|
+ for (unsigned long i = 0; i < ulMechCount; i++) {
|
||||||
|
+ CPPUNIT_ASSERT(pMechanismList[i] != CKM_RSA_X_509);
|
||||||
|
+ CPPUNIT_ASSERT(pMechanismList[i] != CKM_RSA_PKCS);
|
||||||
|
+ }
|
||||||
|
+ free(pMechanismList);
|
||||||
|
+
|
||||||
|
+ CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
|
||||||
|
+#ifndef _WIN32
|
||||||
|
+ setenv("SOFTHSM2_CONF", "./softhsm2.conf", 1);
|
||||||
|
+#else
|
||||||
|
+ setenv("SOFTHSM2_CONF", ".\\softhsm2.conf", 1);
|
||||||
|
+#endif
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void InfoTests::testWaitForSlotEvent()
|
||||||
|
{
|
||||||
|
CK_RV rv;
|
||||||
|
diff --git a/src/lib/test/InfoTests.h b/src/lib/test/InfoTests.h
|
||||||
|
index dfd02953..1cc99ccb 100644
|
||||||
|
--- a/src/lib/test/InfoTests.h
|
||||||
|
+++ b/src/lib/test/InfoTests.h
|
||||||
|
@@ -49,6 +49,7 @@ class InfoTests : public TestsNoPINInitBase
|
||||||
|
CPPUNIT_TEST(testGetMechanismInfo);
|
||||||
|
CPPUNIT_TEST(testGetSlotInfoAlt);
|
||||||
|
CPPUNIT_TEST(testGetMechanismListConfig);
|
||||||
|
+ CPPUNIT_TEST(testGetMechanismNegativeListConfig);
|
||||||
|
CPPUNIT_TEST(testWaitForSlotEvent);
|
||||||
|
CPPUNIT_TEST_SUITE_END();
|
||||||
|
|
||||||
|
@@ -62,6 +63,7 @@ class InfoTests : public TestsNoPINInitBase
|
||||||
|
void testGetMechanismInfo();
|
||||||
|
void testGetSlotInfoAlt();
|
||||||
|
void testGetMechanismListConfig();
|
||||||
|
+ void testGetMechanismNegativeListConfig();
|
||||||
|
void testWaitForSlotEvent();
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/src/lib/test/Makefile.am b/src/lib/test/Makefile.am
|
||||||
|
index 17887dd4..a22ce668 100644
|
||||||
|
--- a/src/lib/test/Makefile.am
|
||||||
|
+++ b/src/lib/test/Makefile.am
|
||||||
|
@@ -39,6 +39,7 @@ EXTRA_DIST = $(srcdir)/CMakeLists.txt \
|
||||||
|
$(srcdir)/*.h \
|
||||||
|
$(srcdir)/softhsm2-alt.conf.win32 \
|
||||||
|
$(srcdir)/softhsm2-reset-on-fork.conf.win32 \
|
||||||
|
+ $(srcdir)/softhsm2-negative-mech.conf.win32 \
|
||||||
|
$(srcdir)/softhsm2-mech.conf.win32 \
|
||||||
|
$(srcdir)/softhsm2.conf.win32 \
|
||||||
|
$(srcdir)/tokens/dummy.in
|
||||||
|
diff --git a/src/lib/test/softhsm2-negative-mech.conf.in b/src/lib/test/softhsm2-negative-mech.conf.in
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..51f7e6ac
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/lib/test/softhsm2-negative-mech.conf.in
|
||||||
|
@@ -0,0 +1,8 @@
|
||||||
|
+# SoftHSM v2 configuration file
|
||||||
|
+
|
||||||
|
+directories.tokendir = @builddir@/tokens
|
||||||
|
+objectstore.backend = file
|
||||||
|
+log.level = INFO
|
||||||
|
+slots.removable = false
|
||||||
|
+slots.mechanisms = -CKM_RSA_X_509,CKM_RSA_PKCS
|
||||||
|
+
|
||||||
|
diff --git a/src/lib/test/softhsm2-negative-mech.conf.win32 b/src/lib/test/softhsm2-negative-mech.conf.win32
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..a3aefb96
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/lib/test/softhsm2-negative-mech.conf.win32
|
||||||
|
@@ -0,0 +1,7 @@
|
||||||
|
+# SoftHSM v2 configuration file
|
||||||
|
+
|
||||||
|
+directories.tokendir = .\tokens
|
||||||
|
+objectstore.backend = file
|
||||||
|
+log.level = INFO
|
||||||
|
+slots.removable = false
|
||||||
|
+slots.mechanisms = -CKM_RSA_X_509,CKM_RSA_PKCS
|
||||||
|
diff --git a/win32/p11test/p11test.vcxproj.in b/win32/p11test/p11test.vcxproj.in
|
||||||
|
index 55dfb087..88859bca 100644
|
||||||
|
--- a/win32/p11test/p11test.vcxproj.in
|
||||||
|
+++ b/win32/p11test/p11test.vcxproj.in
|
||||||
|
@@ -67,6 +67,7 @@ copy ..\..\src\lib\test\softhsm2.conf.win32 "$(TargetDir)\softhsm2.conf"
|
||||||
|
copy ..\..\src\lib\test\softhsm2-alt.conf.win32 "$(TargetDir)\softhsm2-alt.conf"
|
||||||
|
copy ..\..\src\lib\test\softhsm2-reset-on-fork.conf.win32 "$(TargetDir)\softhsm2-reset-on-fork.conf"
|
||||||
|
copy ..\..\src\lib\test\softhsm2-mech.conf.win32 "$(TargetDir)\softhsm2-mech.conf"
|
||||||
|
+copy ..\..\src\lib\test\softhsm2-negative-mech.conf.win32 "$(TargetDir)\softhsm2-negative-mech.conf"
|
||||||
|
mkdir "$(TargetDir)\tokens" 2> nul
|
||||||
|
copy ..\..\src\lib\test\tokens\dummy.in "$(TargetDir)\tokens\dummy"
|
||||||
|
</Command>
|
||||||
|
@@ -99,6 +100,7 @@ copy ..\..\src\lib\test\softhsm2.conf.win32 "$(TargetDir)\softhsm2.conf"
|
||||||
|
copy ..\..\src\lib\test\softhsm2-alt.conf.win32 "$(TargetDir)\softhsm2-alt.conf"
|
||||||
|
copy ..\..\src\lib\test\softhsm2-reset-on-fork.conf.win32 "$(TargetDir)\softhsm2-reset-on-fork.conf"
|
||||||
|
copy ..\..\src\lib\test\softhsm2-mech.conf.win32 "$(TargetDir)\softhsm2-mech.conf"
|
||||||
|
+copy ..\..\src\lib\test\softhsm2-negative-mech.conf.win32 "$(TargetDir)\softhsm2-negative-mech.conf"
|
||||||
|
mkdir "$(TargetDir)\tokens" 2> nul
|
||||||
|
copy ..\..\src\lib\test\tokens\dummy.in "$(TargetDir)\tokens\dummy"
|
||||||
|
</Command>
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue