Skip to content

Commit 2818870

Browse files
committed
Fix most of pkcs11test
1 parent d254640 commit 2818870

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/crypto.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,10 @@ static CK_RV SetAttributeDefaults(WP11_Object* obj, CK_OBJECT_CLASS keyType,
431431
derive = CK_FALSE;
432432
break;
433433
*/
434+
case CKK_RSA:
435+
derive = CK_FALSE;
436+
sign = CK_TRUE;
437+
break;
434438
case CKK_DH:
435439
verify = CK_FALSE;
436440
derive = CK_TRUE;
@@ -440,7 +444,7 @@ static CK_RV SetAttributeDefaults(WP11_Object* obj, CK_OBJECT_CLASS keyType,
440444
break;
441445
case CKK_EC:
442446
derive = CK_FALSE;
443-
verify = CK_FALSE;
447+
verify = CK_TRUE;
444448
encrypt = CK_FALSE;
445449
recover = CK_FALSE;
446450
wrap = CK_FALSE;

tests/pkcs11test.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7254,14 +7254,14 @@ static CK_RV test_rsa_pkcs_sig_fail(void* args)
72547254
}
72557255
if (ret == CKR_OK) {
72567256
mech.pParameter = data;
7257-
ret = funcList->C_VerifyInit(session, &mech, priv);
7257+
ret = funcList->C_VerifyInit(session, &mech, pub);
72587258
CHECK_CKR_FAIL(ret, CKR_MECHANISM_PARAM_INVALID,
72597259
"Verify Init bad parameter");
72607260
mech.pParameter = NULL;
72617261
}
72627262
if (ret == CKR_OK) {
72637263
mech.ulParameterLen = 1;
7264-
ret = funcList->C_VerifyInit(session, &mech, priv);
7264+
ret = funcList->C_VerifyInit(session, &mech, pub);
72657265
CHECK_CKR_FAIL(ret, CKR_MECHANISM_PARAM_INVALID,
72667266
"Verify Init bad parameter length");
72677267
mech.ulParameterLen = 0;
@@ -7323,28 +7323,28 @@ static CK_RV test_rsa_pkcs_pss_sig_fail(void* args)
73237323
}
73247324
if (ret == CKR_OK) {
73257325
mech.pParameter = NULL;
7326-
ret = funcList->C_VerifyInit(session, &mech, priv);
7326+
ret = funcList->C_VerifyInit(session, &mech, pub);
73277327
CHECK_CKR_FAIL(ret, CKR_MECHANISM_PARAM_INVALID,
73287328
"Verify Init NULL parameter");
73297329
mech.pParameter = &params;
73307330
}
73317331
if (ret == CKR_OK) {
73327332
mech.ulParameterLen = 0;
7333-
ret = funcList->C_VerifyInit(session, &mech, priv);
7333+
ret = funcList->C_VerifyInit(session, &mech, pub);
73347334
CHECK_CKR_FAIL(ret, CKR_MECHANISM_PARAM_INVALID,
73357335
"Verify Init bad parameter length");
73367336
mech.ulParameterLen = sizeof(params);
73377337
}
73387338
if (ret == CKR_OK) {
73397339
params.hashAlg = CKM_RSA_PKCS;
7340-
ret = funcList->C_VerifyInit(session, &mech, priv);
7340+
ret = funcList->C_VerifyInit(session, &mech, pub);
73417341
CHECK_CKR_FAIL(ret, CKR_MECHANISM_PARAM_INVALID,
73427342
"Verify Init bad hash algorithm");
73437343
params.hashAlg = CKM_SHA256;
73447344
}
73457345
if (ret == CKR_OK) {
73467346
params.mgf = 0;
7347-
ret = funcList->C_VerifyInit(session, &mech, priv);
7347+
ret = funcList->C_VerifyInit(session, &mech, pub);
73487348
CHECK_CKR_FAIL(ret, CKR_MECHANISM_PARAM_INVALID,
73497349
"Verify Init bad mgf algorithm");
73507350
params.mgf = CKG_MGF1_SHA256;

0 commit comments

Comments
 (0)