Merge ~fheimes/ubuntu/+source/opencryptoki:opencryptoki-sru-lp1915517-focal into ubuntu/+source/opencryptoki:ubuntu/focal-devel

[Frank Heimes]

opencryptoki-sru-lp1915517-focal
    debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch
    Fix failed pkcscca migration with usr/sb2 is not a valid slot ID.
    Added patch f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43
    (now caa4bbba51cf470986944820ea773163084da0b7) from > 3.15.1
    for fixing migration of master key from OLD register to CURRENT register.
    (LP: #1915517)

Test build is available here:
https://launchpad.net/~fheimes/+archive/ubuntu/lp1915517

Unmerged commits

088fa5d... by Frank Heimes on 2021-03-02

  * debian/changelog for debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch

3304a59... by Frank Heimes on 2021-03-02

  * debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch
    fixing migration of master key from OLD register to CURRENT register (from > 3.15.1)
    Thanks to Patrick Steuer (LP: #1915517)

diff --git a/debian/changelog b/debian/changelog
index 9df2e91..67f5b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opencryptoki (3.13.0+dfsg-0ubuntu5.1) focal; urgency=medium
+
+  * debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch
+    fixing migration of master key from OLD register to CURRENT register (from > 3.15.1)
+    Thanks to Patrick Steuer (LP: #1915517)
+
+ -- Frank Heimes <[e-mail]>  Tue, 02 Mar 2021 14:09:59 +0100
+
 opencryptoki (3.13.0+dfsg-0ubuntu5) focal; urgency=medium
 
   * Enable locks by default, on all architectures, which is the new
diff --git a/debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch b/debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch
 new file mode 100644
index 0000000..3df63d5
--- /dev/null
+++ b/debian/patches/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch
@@ -0,0 +1,55 @@
+From caa4bbba51cf470986944820ea773163084da0b7 Mon Sep 17 00:00:00 2001
+From: Patrick Steuer <[e-mail]>
+Date: Tue, 19 Jan 2021 14:29:57 +0100
+Subject: [PATCH] A slot ID has nothing to do with the number of slots
+
+Signed-off-by: Patrick Steuer <[e-mail]>
+
+Author: Patrick Steuer <[e-mail]>
+Origin: upstream, https://github.com/opencryptoki/opencryptoki/commit/f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43
+        (now https://github.com/opencryptoki/opencryptoki/commit/caa4bbba51cf470986944820ea773163084da0b7)
+Bug-IBM: Bugzilla 191527
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1915517
+Applied-Upstream: > v3.15.1
+Reviewed-by: Frank Heimes <[e-mail]>
+Last-Update: 2021-03-02
+
+---
+ usr/sbin/pkcscca/pkcscca.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/usr/sbin/pkcscca/pkcscca.c b/usr/sbin/pkcscca/pkcscca.c
+index c09f16b3..aa74eeb8 100644
+--- a/usr/sbin/pkcscca/pkcscca.c
++++ b/usr/sbin/pkcscca/pkcscca.c
+@@ -1142,7 +1142,6 @@ int migrate_wrapped_keys(CK_SLOT_ID slot_id, char *userpin, int masterkey)
+ {
+     CK_FUNCTION_LIST *funcs;
+     CK_KEY_TYPE key_type = 0;
+-    CK_ULONG slot_count;
+     CK_SESSION_HANDLE sess;
+     CK_RV rv;
+     struct key_count count = { 0, 0, 0, 0, 0, 0, 0 };
+@@ -1154,19 +1153,6 @@ int migrate_wrapped_keys(CK_SLOT_ID slot_id, char *userpin, int masterkey)
+         return 2;
+     }
+ 
+-    rv = funcs->C_GetSlotList(TRUE, NULL_PTR, &slot_count);
+-    if (rv != CKR_OK) {
+-        p11_error("C_GetSlotList", rv);
+-        exit_code = 3;
+-        goto finalize;
+-    }
+-
+-    if (slot_id >= slot_count) {
+-        print_error("%lu is not a valid slot ID.", slot_id);
+-        exit_code = 4;
+-        goto finalize;
+-    }
+-
+     rv = funcs->C_OpenSession(slot_id, CKF_RW_SESSION |
+                               CKF_SERIAL_SESSION, NULL_PTR, NULL_PTR, &sess);
+     if (rv != CKR_OK) {
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 58aa2da..89f2729 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03-dlopen-soname.patch
 04-pkcsslotd-cmdline-args.patch
 
+f1f176cbb4183bcb8a0f7b4d7f649d84a731dd43.patch