Ticket #124: pkcs11-tool-test.patch

src/tools/pkcs11-tool.c

@@ -2282 +2282 @@
                         printf(" -- can't be used for signature, skipping\n");
                         continue;
                 }
+                modLenBytes = (get_private_key_length(sess, privKeyObject) + 7) / 8;
+                if(modLenBytes <= 0) {
+                        printf(" -- can't be used for signature, skipping: can't obtain modulus\n");
+                        continue;
+                }
                 printf("\n");
                 break;
         }
@@ -2292 +2297 @@
 
         data[0] = 0;
         data[1] = 1;
-        modLenBytes = (get_private_key_length(sess, privKeyObject) + 7) / 8;
 
         /* 1st test */
 
@@ -2424 +2428 @@
                 label = getLABEL(sess, privKeyObject, NULL);
                 modLenBits = get_private_key_length(sess, privKeyObject);
                 modLenBytes = (modLenBits + 7) / 8;
-
+                
                 printf("  testing key %d (%u bits%s%s) with 1 signature mechanism",
                                 (int) (j-1),
                                 (int) modLenBits,
@@ -2436 +2440 @@
                 if (!getSIGN(sess, privKeyObject)) {
                         printf(" -- can't be used to sign/verify, skipping\n");
                         continue;
+                } else if(modLenBytes <= 0) {
+                        printf(" -- can't be used to sign/verify, skipping: can't obtain modulus\n");
+                        continue;
                 }
                 else
                         printf("\n");
@@ -2590 +2597 @@
                 }
 
                 key_len = (get_private_key_length(sess, priv_key) + 7) / 8;
+                if(key_len <= 0) {
+                        printf(" -- can't get the modulus length, skipping\n");
+                        continue;
+                }
 
                 errors += sign_verify(slot, sess, priv_key, key_len, pub_key, i != 0);
         }