Update SoftHSM token import scripting and reimport

The slot numbers get reassigned now.

The RSA key modulus had been imported with a leading zero bytes,
confusing SoftHSM when it tried to perform CKM_RSA_PKCS or
CKM_RSA_PKCS_PSS signatures.

https://github.com/opendnssec/SoftHSMv2/issues/544

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bcc91212f625f3859c8117417f9e0604f7d42fca..ba7b88f74fdb311475ed2c39192b55b5645e0338 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -196,22 +196,22 @@ P11TOOL=SOFTHSM2_CONF=softhsm2.conf p11tool
 # Nice and simple: Certs visible without login, public keys present in token
 softhsm-setup0:
        $(SHM2_UTIL) --show-slots
-       $(SHM2_UTIL) --init-token --slot 0 --label openconnect-test \
+       $(SHM2_UTIL) --init-token --free --label openconnect-test \
                --so-pin 12345678 --pin 1234
 
-       $(SHM2_UTIL) --slot 0 --pin 1234 --import $(certsdir)/user-key-pkcs8.pem \
+       $(SHM2_UTIL) --token openconnect-test --pin 1234 --import $(certsdir)/user-key-pkcs8.pem \
                --label RSA --id 01
        $(P11TOOL) --load-certificate $(certsdir)/user-cert.pem --no-mark-private \
                   --label RSA --id 01 --set-pin 1234 --login \
                   --write "pkcs11:token=openconnect-test;pin-value=1234"
 
-       $(SHM2_UTIL) --slot 0 --pin 1234 --import $(certsdir)/dsa-key-pkcs8.pem \
+       $(SHM2_UTIL) --token openconnect-test --pin 1234 --import $(certsdir)/dsa-key-pkcs8.pem \
                --label DSA --id 02
        $(P11TOOL) --load-certificate $(certsdir)/dsa-cert.pem --no-mark-private \
                   --label DSA --id 02 --set-pin 1234 --login \
                   --write "pkcs11:token=openconnect-test;pin-value=1234"
 
-       $(SHM2_UTIL) --slot 0 --pin 1234 --import $(certsdir)/ec-key-pkcs8.pem \
+       $(SHM2_UTIL) --token openconnect-test --pin 1234 --import $(certsdir)/ec-key-pkcs8.pem \
                        --label EC --id 03
        $(P11TOOL) --load-certificate $(certsdir)/ec-cert.pem --no-mark-private \
                   --label EC --id 03 --set-pin 1234 --login \
@@ -220,7 +220,7 @@ softhsm-setup0:
 # Second test: Import keys with GnuTLS so public key is absent
 softhsm-setup1:
        $(SHM2_UTIL) --show-slots
-       $(SHM2_UTIL) --init-token --slot 1 --label openconnect-test1 \
+       $(SHM2_UTIL) --init-token --free --label openconnect-test1 \
                --so-pin 12345678 --pin 1234
 
        $(P11TOOL) --load-certificate $(certsdir)/user-cert.pem --no-mark-private \
@@ -241,7 +241,7 @@ softhsm-setup1:
 # Third test: CKA_PRIVATE on certificates
 softhsm-setup2:
        $(SHM2_UTIL) --show-slots
-       $(SHM2_UTIL) --init-token --slot 2 --label openconnect-test2 \
+       $(SHM2_UTIL) --init-token --free --label openconnect-test2 \
                --so-pin 12345678 --pin 1234
 
        $(P11TOOL) --load-certificate $(certsdir)/user-cert.pem \

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/204fb296-6512-bade-d242-0c01c6fee44c.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/44aab3a8-a514-9538-b5e6-4840f74a8d13.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/204fb296-6512-bade-d242-0c01c6fee44c.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/44aab3a8-a514-9538-b5e6-4840f74a8d13.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/44aab3a8-a514-9538-b5e6-4840f74a8d13.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/44aab3a8-a514-9538-b5e6-4840f74a8d13.object
new file mode 100644 (file)
index 0000000..16852ca
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/44aab3a8-a514-9538-b5e6-4840f74a8d13.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/5538dde5-7b14-df05-1759-483312e6152e.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/5dc84bbf-0814-0166-8e4c-531f2b436762.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/5538dde5-7b14-df05-1759-483312e6152e.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/5dc84bbf-0814-0166-8e4c-531f2b436762.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/5dc84bbf-0814-0166-8e4c-531f2b436762.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/5dc84bbf-0814-0166-8e4c-531f2b436762.object
new file mode 100644 (file)
index 0000000..251e4aa
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/5dc84bbf-0814-0166-8e4c-531f2b436762.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/579fac93-d85d-cd55-d408-c78554e25729.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/60fe7df5-d871-b314-4590-9774305cc2ba.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/579fac93-d85d-cd55-d408-c78554e25729.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/60fe7df5-d871-b314-4590-9774305cc2ba.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/60fe7df5-d871-b314-4590-9774305cc2ba.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/60fe7df5-d871-b314-4590-9774305cc2ba.object
new file mode 100644 (file)
index 0000000..ea5a106
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/60fe7df5-d871-b314-4590-9774305cc2ba.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/59317483-f144-2131-8caf-daa57a47e9d6.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/9a94a6df-b356-05a5-7484-0e93727c1d15.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/59317483-f144-2131-8caf-daa57a47e9d6.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/9a94a6df-b356-05a5-7484-0e93727c1d15.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/9a94a6df-b356-05a5-7484-0e93727c1d15.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/9a94a6df-b356-05a5-7484-0e93727c1d15.object
new file mode 100644 (file)
index 0000000..0529f0a
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/9a94a6df-b356-05a5-7484-0e93727c1d15.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/a15b55d6-1502-bdcf-634c-5d35d3403354.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/c6eb58c1-741d-aa8f-9ce7-88cee037c6a1.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/a15b55d6-1502-bdcf-634c-5d35d3403354.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/c6eb58c1-741d-aa8f-9ce7-88cee037c6a1.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/c6eb58c1-741d-aa8f-9ce7-88cee037c6a1.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/c6eb58c1-741d-aa8f-9ce7-88cee037c6a1.object
new file mode 100644 (file)
index 0000000..5023460
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/c6eb58c1-741d-aa8f-9ce7-88cee037c6a1.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/ae22c3cd-e90a-4a8a-b008-26cf5f54bb8f.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/eb6abab4-2248-d12f-cf30-435efe964bae.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/ae22c3cd-e90a-4a8a-b008-26cf5f54bb8f.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/eb6abab4-2248-d12f-cf30-435efe964bae.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/eb6abab4-2248-d12f-cf30-435efe964bae.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/eb6abab4-2248-d12f-cf30-435efe964bae.object
new file mode 100644 (file)
index 0000000..a65d9fb
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/eb6abab4-2248-d12f-cf30-435efe964bae.object differ

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/generation b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/generation
new file mode 100644 (file)
index 0000000..379d85c
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/generation differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/token.lock b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/token.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/token.lock
rename to tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/token.lock

diff --git a/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/token.object b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/token.object
new file mode 100644 (file)
index 0000000..05dc2ff
Binary files /dev/null and b/tests/softhsm/17d09202-a0f3-7e39-6756-d42bd03dda81/token.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/204fb296-6512-bade-d242-0c01c6fee44c.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/204fb296-6512-bade-d242-0c01c6fee44c.object
deleted file mode 100644 (file)
index 4a50e79..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/204fb296-6512-bade-d242-0c01c6fee44c.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/5538dde5-7b14-df05-1759-483312e6152e.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/5538dde5-7b14-df05-1759-483312e6152e.object
deleted file mode 100644 (file)
index bf95395..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/5538dde5-7b14-df05-1759-483312e6152e.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/579fac93-d85d-cd55-d408-c78554e25729.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/579fac93-d85d-cd55-d408-c78554e25729.object
deleted file mode 100644 (file)
index 0ccad83..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/579fac93-d85d-cd55-d408-c78554e25729.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/59317483-f144-2131-8caf-daa57a47e9d6.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/59317483-f144-2131-8caf-daa57a47e9d6.object
deleted file mode 100644 (file)
index 48692e8..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/59317483-f144-2131-8caf-daa57a47e9d6.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/a15b55d6-1502-bdcf-634c-5d35d3403354.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/a15b55d6-1502-bdcf-634c-5d35d3403354.object
deleted file mode 100644 (file)
index ca6ab03..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/a15b55d6-1502-bdcf-634c-5d35d3403354.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/ae22c3cd-e90a-4a8a-b008-26cf5f54bb8f.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/ae22c3cd-e90a-4a8a-b008-26cf5f54bb8f.object
deleted file mode 100644 (file)
index 26b1d3b..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/ae22c3cd-e90a-4a8a-b008-26cf5f54bb8f.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/b9354336-70ae-cbe8-72f7-395370bd14e6.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/b9354336-70ae-cbe8-72f7-395370bd14e6.object
deleted file mode 100644 (file)
index fd7961d..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/b9354336-70ae-cbe8-72f7-395370bd14e6.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/c623044d-bc60-8200-06e4-3d78db26d0fe.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/c623044d-bc60-8200-06e4-3d78db26d0fe.object
deleted file mode 100644 (file)
index 36a9fca..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/c623044d-bc60-8200-06e4-3d78db26d0fe.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/generation b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/generation
deleted file mode 100644 (file)
index 21cf4e2..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/generation and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/token.object b/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/token.object
deleted file mode 100644 (file)
index bad69c3..0000000
Binary files a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/token.object and /dev/null differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2b0bce68-9f8f-fea8-8b1d-33904e06bc31.object b/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2b0bce68-9f8f-fea8-8b1d-33904e06bc31.object
deleted file mode 100644 (file)
index 98746aa..0000000
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2b0bce68-9f8f-fea8-8b1d-33904e06bc31.object and /dev/null differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/a9ab8460-063c-0884-ecaa-7bd524ec6c17.object b/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/a9ab8460-063c-0884-ecaa-7bd524ec6c17.object
deleted file mode 100644 (file)
index afdec1c..0000000
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/a9ab8460-063c-0884-ecaa-7bd524ec6c17.object and /dev/null differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/f095d2b1-1592-4f77-80a7-e5cc04fcc634.object b/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/f095d2b1-1592-4f77-80a7-e5cc04fcc634.object
deleted file mode 100644 (file)
index 4fe679f..0000000
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/f095d2b1-1592-4f77-80a7-e5cc04fcc634.object and /dev/null differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/generation b/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/generation
deleted file mode 100644 (file)
index 2b895e7..0000000
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/generation and /dev/null differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/token.object b/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/token.object
deleted file mode 100644 (file)
index 0254f3c..0000000
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/token.object and /dev/null differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/48007f21-a8e2-d606-fab0-de8393d2c322.object b/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/48007f21-a8e2-d606-fab0-de8393d2c322.object
deleted file mode 100644 (file)
index 18258b0..0000000
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/48007f21-a8e2-d606-fab0-de8393d2c322.object and /dev/null differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/4d66cbae-8ee2-5c3c-f37a-600e199da0d5.object b/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/4d66cbae-8ee2-5c3c-f37a-600e199da0d5.object
deleted file mode 100644 (file)
index 4db9457..0000000
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/4d66cbae-8ee2-5c3c-f37a-600e199da0d5.object and /dev/null differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/5d7b9111-1c2f-e2cb-d67b-5cf6683b3ff9.object b/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/5d7b9111-1c2f-e2cb-d67b-5cf6683b3ff9.object
deleted file mode 100644 (file)
index 5921f70..0000000
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/5d7b9111-1c2f-e2cb-d67b-5cf6683b3ff9.object and /dev/null differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/7db3c773-52be-09fb-eee9-dc260ef904ce.object b/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/7db3c773-52be-09fb-eee9-dc260ef904ce.object
deleted file mode 100644 (file)
index f9fa2d4..0000000
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/7db3c773-52be-09fb-eee9-dc260ef904ce.object and /dev/null differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/generation b/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/generation
deleted file mode 100644 (file)
index 46715fa..0000000
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/generation and /dev/null differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/token.object b/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/token.object
deleted file mode 100644 (file)
index 2b5e3aa..0000000
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/token.object and /dev/null differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/b9354336-70ae-cbe8-72f7-395370bd14e6.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/04930534-29a3-d366-1cc3-2c742f567f26.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/b9354336-70ae-cbe8-72f7-395370bd14e6.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/04930534-29a3-d366-1cc3-2c742f567f26.lock

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2a5f48d0-8d6b-1329-67b9-e657e5313ede.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/04930534-29a3-d366-1cc3-2c742f567f26.object
similarity index 89%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2a5f48d0-8d6b-1329-67b9-e657e5313ede.object
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/04930534-29a3-d366-1cc3-2c742f567f26.object
index 710fe74292ebaf1e7513fbcbc22ded65b6e036bf..4c1ec7e74b3f84b41dbaeb78558c5e04bc08647f 100644 (file)
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2a5f48d0-8d6b-1329-67b9-e657e5313ede.object and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/04930534-29a3-d366-1cc3-2c742f567f26.object differ

diff --git a/tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/c623044d-bc60-8200-06e4-3d78db26d0fe.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/201ac72d-662d-487e-9a10-38feadbf8cdf.lock
similarity index 100%
rename from tests/softhsm/3dc692bc-4c91-91a2-488d-6dd1669acb88/c623044d-bc60-8200-06e4-3d78db26d0fe.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/201ac72d-662d-487e-9a10-38feadbf8cdf.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/201ac72d-662d-487e-9a10-38feadbf8cdf.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/201ac72d-662d-487e-9a10-38feadbf8cdf.object
new file mode 100644 (file)
index 0000000..497f3c2
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/201ac72d-662d-487e-9a10-38feadbf8cdf.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2453bdfc-9a97-5a88-d92d-2e46d5f7fe4e.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/89261cf0-2f30-0cd8-c823-0cd99f061b61.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2453bdfc-9a97-5a88-d92d-2e46d5f7fe4e.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/89261cf0-2f30-0cd8-c823-0cd99f061b61.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/89261cf0-2f30-0cd8-c823-0cd99f061b61.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/89261cf0-2f30-0cd8-c823-0cd99f061b61.object
new file mode 100644 (file)
index 0000000..6c8da66
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/89261cf0-2f30-0cd8-c823-0cd99f061b61.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2a5f48d0-8d6b-1329-67b9-e657e5313ede.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/98271b77-e49d-5819-d17b-b7d4b5513ba6.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2a5f48d0-8d6b-1329-67b9-e657e5313ede.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/98271b77-e49d-5819-d17b-b7d4b5513ba6.lock

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2453bdfc-9a97-5a88-d92d-2e46d5f7fe4e.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/98271b77-e49d-5819-d17b-b7d4b5513ba6.object
similarity index 85%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2453bdfc-9a97-5a88-d92d-2e46d5f7fe4e.object
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/98271b77-e49d-5819-d17b-b7d4b5513ba6.object
index 8ea31210d2a584a048102db577c9fb900e76cf38..9fe2492b6631b2b5a1a6c7f73f56dfe4ce7dbbe5 100644 (file)
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2453bdfc-9a97-5a88-d92d-2e46d5f7fe4e.object and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/98271b77-e49d-5819-d17b-b7d4b5513ba6.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2b0bce68-9f8f-fea8-8b1d-33904e06bc31.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/b99ba013-3330-0c2e-8c20-8b309f1f548a.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/2b0bce68-9f8f-fea8-8b1d-33904e06bc31.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/b99ba013-3330-0c2e-8c20-8b309f1f548a.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/b99ba013-3330-0c2e-8c20-8b309f1f548a.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/b99ba013-3330-0c2e-8c20-8b309f1f548a.object
new file mode 100644 (file)
index 0000000..24f920c
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/b99ba013-3330-0c2e-8c20-8b309f1f548a.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/8a45fb7d-e985-5950-6099-1938ac16b4e8.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/c4d1b0f3-f411-1062-4816-5540f523fd17.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/8a45fb7d-e985-5950-6099-1938ac16b4e8.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/c4d1b0f3-f411-1062-4816-5540f523fd17.lock

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/8a45fb7d-e985-5950-6099-1938ac16b4e8.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/c4d1b0f3-f411-1062-4816-5540f523fd17.object
similarity index 89%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/8a45fb7d-e985-5950-6099-1938ac16b4e8.object
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/c4d1b0f3-f411-1062-4816-5540f523fd17.object
index ff7125edc174419fcde054b259e6092d12d47512..17530da2133707672cb6d4ee22705cfed5db7a36 100644 (file)
Binary files a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/8a45fb7d-e985-5950-6099-1938ac16b4e8.object and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/c4d1b0f3-f411-1062-4816-5540f523fd17.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/a9ab8460-063c-0884-ecaa-7bd524ec6c17.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/d601a7a8-08eb-010c-64ea-a1fa4c1f7b21.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/a9ab8460-063c-0884-ecaa-7bd524ec6c17.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/d601a7a8-08eb-010c-64ea-a1fa4c1f7b21.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/d601a7a8-08eb-010c-64ea-a1fa4c1f7b21.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/d601a7a8-08eb-010c-64ea-a1fa4c1f7b21.object
new file mode 100644 (file)
index 0000000..1bc25f7
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/d601a7a8-08eb-010c-64ea-a1fa4c1f7b21.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/f095d2b1-1592-4f77-80a7-e5cc04fcc634.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/e79b4f92-3718-e8b4-afb9-e9d0615b183b.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/f095d2b1-1592-4f77-80a7-e5cc04fcc634.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/e79b4f92-3718-e8b4-afb9-e9d0615b183b.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/e79b4f92-3718-e8b4-afb9-e9d0615b183b.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/e79b4f92-3718-e8b4-afb9-e9d0615b183b.object
new file mode 100644 (file)
index 0000000..d35a65e
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/e79b4f92-3718-e8b4-afb9-e9d0615b183b.object differ

diff --git a/tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/token.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/ebd0e0c6-9e16-6d8e-3e7d-c6852728bfeb.lock
similarity index 100%
rename from tests/softhsm/3e606151-441f-fd0b-2b41-bd372ec8723f/token.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/ebd0e0c6-9e16-6d8e-3e7d-c6852728bfeb.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/ebd0e0c6-9e16-6d8e-3e7d-c6852728bfeb.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/ebd0e0c6-9e16-6d8e-3e7d-c6852728bfeb.object
new file mode 100644 (file)
index 0000000..c80caa3
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/ebd0e0c6-9e16-6d8e-3e7d-c6852728bfeb.object differ

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/generation b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/generation
new file mode 100644 (file)
index 0000000..c15663d
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/generation differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/token.lock b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/token.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/token.lock
rename to tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/token.lock

diff --git a/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/token.object b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/token.object
new file mode 100644 (file)
index 0000000..a4aae76
Binary files /dev/null and b/tests/softhsm/8d81d97f-2a4d-5457-0168-3e7ff0e845a8/token.object differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/48007f21-a8e2-d606-fab0-de8393d2c322.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/3d7a70d4-a34f-d28b-b1d4-8025026e0eb2.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/48007f21-a8e2-d606-fab0-de8393d2c322.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/3d7a70d4-a34f-d28b-b1d4-8025026e0eb2.lock

diff --git a/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/3d7a70d4-a34f-d28b-b1d4-8025026e0eb2.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/3d7a70d4-a34f-d28b-b1d4-8025026e0eb2.object
new file mode 100644 (file)
index 0000000..7a65586
Binary files /dev/null and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/3d7a70d4-a34f-d28b-b1d4-8025026e0eb2.object differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/4d66cbae-8ee2-5c3c-f37a-600e199da0d5.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/77caef11-4401-c6fc-c059-c7980cd70378.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/4d66cbae-8ee2-5c3c-f37a-600e199da0d5.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/77caef11-4401-c6fc-c059-c7980cd70378.lock

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d4f69eea-d907-a976-5814-dc67c560fe4c.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/77caef11-4401-c6fc-c059-c7980cd70378.object
similarity index 89%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d4f69eea-d907-a976-5814-dc67c560fe4c.object
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/77caef11-4401-c6fc-c059-c7980cd70378.object
index ff7125edc174419fcde054b259e6092d12d47512..17530da2133707672cb6d4ee22705cfed5db7a36 100644 (file)
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d4f69eea-d907-a976-5814-dc67c560fe4c.object and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/77caef11-4401-c6fc-c059-c7980cd70378.object differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/5d7b9111-1c2f-e2cb-d67b-5cf6683b3ff9.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/7c716ad5-3ae9-afbb-df0f-e007538f62f7.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/5d7b9111-1c2f-e2cb-d67b-5cf6683b3ff9.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/7c716ad5-3ae9-afbb-df0f-e007538f62f7.lock

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d5e1dd1e-63d2-49d5-65dc-117c1394b687.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/7c716ad5-3ae9-afbb-df0f-e007538f62f7.object
similarity index 85%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d5e1dd1e-63d2-49d5-65dc-117c1394b687.object
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/7c716ad5-3ae9-afbb-df0f-e007538f62f7.object
index 8ea31210d2a584a048102db577c9fb900e76cf38..9fe2492b6631b2b5a1a6c7f73f56dfe4ce7dbbe5 100644 (file)
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d5e1dd1e-63d2-49d5-65dc-117c1394b687.object and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/7c716ad5-3ae9-afbb-df0f-e007538f62f7.object differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/7db3c773-52be-09fb-eee9-dc260ef904ce.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/93b023dc-1018-33a8-fb1a-645c18f4048d.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/7db3c773-52be-09fb-eee9-dc260ef904ce.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/93b023dc-1018-33a8-fb1a-645c18f4048d.lock

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/a14b1c07-fd7b-bec1-d93b-03727572ea70.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/93b023dc-1018-33a8-fb1a-645c18f4048d.object
similarity index 89%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/a14b1c07-fd7b-bec1-d93b-03727572ea70.object
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/93b023dc-1018-33a8-fb1a-645c18f4048d.object
index 710fe74292ebaf1e7513fbcbc22ded65b6e036bf..4c1ec7e74b3f84b41dbaeb78558c5e04bc08647f 100644 (file)
Binary files a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/a14b1c07-fd7b-bec1-d93b-03727572ea70.object and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/93b023dc-1018-33a8-fb1a-645c18f4048d.object differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/a14b1c07-fd7b-bec1-d93b-03727572ea70.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/b921053a-fe7b-59cf-a483-7cbca04d9eae.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/a14b1c07-fd7b-bec1-d93b-03727572ea70.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/b921053a-fe7b-59cf-a483-7cbca04d9eae.lock

diff --git a/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/b921053a-fe7b-59cf-a483-7cbca04d9eae.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/b921053a-fe7b-59cf-a483-7cbca04d9eae.object
new file mode 100644 (file)
index 0000000..05d28c6
Binary files /dev/null and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/b921053a-fe7b-59cf-a483-7cbca04d9eae.object differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d4f69eea-d907-a976-5814-dc67c560fe4c.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/f9d9bf7a-fcb4-7aa9-8792-5a0e4ff86608.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d4f69eea-d907-a976-5814-dc67c560fe4c.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/f9d9bf7a-fcb4-7aa9-8792-5a0e4ff86608.lock

diff --git a/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/f9d9bf7a-fcb4-7aa9-8792-5a0e4ff86608.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/f9d9bf7a-fcb4-7aa9-8792-5a0e4ff86608.object
new file mode 100644 (file)
index 0000000..d217418
Binary files /dev/null and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/f9d9bf7a-fcb4-7aa9-8792-5a0e4ff86608.object differ

diff --git a/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/generation b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/generation
new file mode 100644 (file)
index 0000000..379d85c
Binary files /dev/null and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/generation differ

diff --git a/tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d5e1dd1e-63d2-49d5-65dc-117c1394b687.lock b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/token.lock
similarity index 100%
rename from tests/softhsm/78239b73-64e9-44df-76cf-8dc68ccc7dab/d5e1dd1e-63d2-49d5-65dc-117c1394b687.lock
rename to tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/token.lock

diff --git a/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/token.object b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/token.object
new file mode 100644 (file)
index 0000000..5785877
Binary files /dev/null and b/tests/softhsm/e3892d27-7946-8c47-3e77-dc17250acc6a/token.object differ