giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs11-tool: fix output of test_decrypt 

Before the output looked like this, if a public key was not found:
```
  testing key 1 (IDKey2)
    RSA-X-509: OK
    RSA-PKCS: OK
  testing key 2 (IDKey3)
couldn't find the corresponding pubkey for validation
couldn't find the corresponding pubkey for validation
    RSA-X-509:     RSA-PKCS:   testing key 3 (IDKey4)
couldn't find the corresponding pubkey for validation
couldn't find the corresponding pubkey for validation
```

Now:
```
  testing key 1 (IDKey2)
    RSA-X-509: OK
    RSA-PKCS: OK
  testing key 2 (IDKey3) -- can't find corresponding public key, skipping
  testing key 3 (IDKey4) -- can't find corresponding public key, skipping
```
This commit is contained in:
Julian Strobl 2019-12-19 17:20:51 +01:00 committed by Frank Morgner
parent 81940e123b
commit e9aa163fe5
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tools/pkcs11-tool.c
View File

@ -5840,10 +5840,11 @@ static int test_decrypt(CK_SESSION_HANDLE sess)
{
int errors = 0;
CK_RV rv;
CK_OBJECT_HANDLE privKeyObject;
unsigned char *id;
CK_OBJECT_HANDLE pubKeyObject, privKeyObject;
CK_MECHANISM_TYPE *mechs = NULL;
CK_SESSION_INFO sessionInfo;
CK_ULONG j, num_mechs = 0;
CK_ULONG j, num_mechs = 0, id_len;
#ifdef ENABLE_OPENSSL
CK_ULONG n;
#endif
@ -5865,9 +5866,9 @@ static int test_decrypt(CK_SESSION_HANDLE sess)
printf("Decryption (currently only for RSA)\n");
for (j = 0; find_object(sess, CKO_PRIVATE_KEY, &privKeyObject, NULL, 0, j); j++) {
printf(" testing key %ld ", j);
printf(" testing key %ld", j);
if ((label = getLABEL(sess, privKeyObject, NULL)) != NULL) {
printf("(%s) ", label);
printf(" (%s)", label);
free(label);
}
if (getKEY_TYPE(sess, privKeyObject) != CKK_RSA) {
@ -5878,6 +5879,22 @@ static int test_decrypt(CK_SESSION_HANDLE sess)
printf(" -- can't be used to decrypt, skipping\n");
continue;
}
if ((id = getID(sess, privKeyObject, &id_len)) != NULL) {
int r;
r = find_object(sess, CKO_PUBLIC_KEY, &pubKeyObject, id, id_len, 0);
free(id);
if (r == 0) {
printf(" -- can't find corresponding public key, skipping\n");
continue;
}
}
else {
printf(" -- can't get the ID for looking up the public key, skipping\n");
continue;
}
printf("\n");
#ifndef ENABLE_OPENSSL