On 13-01-2017 12:34, Harald Freudenberger wrote: > Wrong file attributes fixed on all the *.c files which had > the executable bit switched on. > tok_des.c does not use DES any more, instead an AES key > is now used. tok_rsa.c checks the lower and upper key size > requirements for the token when trying to generate RSA key pairs > and may skip the generation if not supported (e.g. ep11 token > does not support 512 bit RSA). > > Signed-off-by: Harald Freudenberger <[email protected]> > --- > testcases/misc_tests/speed.c | 0 > testcases/misc_tests/threadmkobj.c | 0 > testcases/misc_tests/tok_des.c | 58 +++++++++---------- > testcases/misc_tests/tok_obj.c | 0 > testcases/misc_tests/tok_obj2.c | 0 > testcases/misc_tests/tok_rsa.c | 110 > ++++++++++++++++++++++++++++--------- > 6 files changed, 115 insertions(+), 53 deletions(-) > mode change 100755 => 100644 testcases/misc_tests/speed.c > mode change 100755 => 100644 testcases/misc_tests/threadmkobj.c > mode change 100755 => 100644 testcases/misc_tests/tok_obj.c > mode change 100755 => 100644 testcases/misc_tests/tok_obj2.c > > diff --git a/testcases/misc_tests/speed.c b/testcases/misc_tests/speed.c > old mode 100755 > new mode 100644 > diff --git a/testcases/misc_tests/threadmkobj.c > b/testcases/misc_tests/threadmkobj.c > old mode 100755 > new mode 100644 > diff --git a/testcases/misc_tests/tok_des.c b/testcases/misc_tests/tok_des.c > index 075084f..5dda290 100644 > --- a/testcases/misc_tests/tok_des.c > +++ b/testcases/misc_tests/tok_des.c > @@ -113,10 +113,13 @@ do_GenerateTokenSymKey(CK_SESSION_HANDLE sess, CK_BYTE > *label, CK_ULONG type) > CK_OBJECT_HANDLE key; > CK_RV rv; > CK_BBOOL true = 1; > + CK_ULONG key_len = 16; > CK_ATTRIBUTE tmpl[] = { > {CKA_LABEL, label, (CK_ULONG)strlen((char *)label) + 1 }, > - {CKA_TOKEN, &true, sizeof(CK_BBOOL) } > + {CKA_TOKEN, &true, sizeof(CK_BBOOL) }, > + {CKA_VALUE_LEN, &key_len, sizeof(CK_ULONG) } > }; > + int attr = (type == CKM_AES_KEY_GEN ? 3 : 2); > > printf("do_GenerateTokenSymKey...\n"); > > @@ -124,8 +127,7 @@ do_GenerateTokenSymKey(CK_SESSION_HANDLE sess, CK_BYTE > *label, CK_ULONG type) > mech.ulParameterLen = 0; > mech.pParameter = NULL; > > - rv = funcs->C_GenerateKey( sess, &mech, > - tmpl, 2, &key ); > + rv = funcs->C_GenerateKey( sess, &mech, tmpl, attr, &key ); > if (rv != CKR_OK) { > show_error(" C_GenerateKey #1", rv ); > return rv; > @@ -151,7 +153,7 @@ main( int argc, char **argv ) > CK_SESSION_HANDLE session; > CK_FLAGS flags; > CK_BYTE tdes_label[] = "XXX DELETE ME TEST 3DES KEY"; > - CK_BYTE des_label[] = "XXX DELETE ME TEST DES KEY"; > + CK_BYTE aes_label[] = "XXX DELETE ME TEST AES KEY"; > > > for (i=1; i < argc; i++) { > @@ -210,27 +212,27 @@ main( int argc, char **argv ) > return rv; > } > > - if (mech_supported(slot_id, CKM_DES_KEY_GEN)) { > - rv = do_GenerateTokenSymKey(session, des_label, > CKM_DES_KEY_GEN); > + if (mech_supported(slot_id, CKM_DES3_KEY_GEN)) { > + rv = do_GenerateTokenSymKey(session, tdes_label, > CKM_DES3_KEY_GEN); > if (rv != CKR_OK) { > - show_error("do_GenerateTokenRSAKeyPair(512)", rv); > + show_error("do_GenerateTokenSymKey(...DES3_KEY)", rv); > return -1; > } > - } else { > - testcase_skip("GenerateTokenSymKey(...DES_KEY_GEN)"); > - des_label[0] = 0; > - } > + } else { > + testcase_skip("GenerateTokenSymKey(...DES3_KEY)"); > + tdes_label[0] = 0; > + } > > - if (mech_supported(slot_id, CKM_DES3_KEY_GEN)) { > - rv = do_GenerateTokenSymKey(session, tdes_label, > CKM_DES3_KEY_GEN); > + if (mech_supported(slot_id, CKM_AES_KEY_GEN)) { > + rv = do_GenerateTokenSymKey(session, aes_label, > CKM_AES_KEY_GEN); > if (rv != CKR_OK) { > - show_error("do_GenerateTokenRSAKeyPair(512)", rv); > + show_error("do_GenerateTokenSymKey(...AES_KEY)", rv); > return -1; > } > - } else { > - testcase_skip("GenerateTokenSymKey(...DES3_KEY_GEN)"); > - tdes_label[0] = 0; > - } > + } else { > + testcase_skip("GenerateTokenSymKey(...AES_KEY)"); > + aes_label[0] = 0; > + } > > rv = funcs->C_CloseSession( session ); > if (rv != CKR_OK) { > @@ -265,24 +267,24 @@ main( int argc, char **argv ) > goto close_session; > } > > - if (des_label[0]) { > - rv = do_VerifyTokenSymKey(session, des_label); > + if (tdes_label[0]) { > + rv = do_VerifyTokenSymKey(session, tdes_label); > if (rv != CKR_OK) { > - show_error("do_VerifyTokenRSAKeyPair(512)", rv); > + show_error("do_VerifyTokenSymKey(...DES3_KEY...)", rv); > goto close_session; > } > - } else { > - testcase_skip("VerifyTokenSymKey(...DES_KEY...)"); > - } > + } else { > + testcase_skip("VerifyTokenSymKey(...DES3_KEY...)"); > + } > > - if (tdes_label[0]) { > - rv = do_VerifyTokenSymKey(session, tdes_label); > + if (aes_label[0]) { > + rv = do_VerifyTokenSymKey(session, aes_label); > if (rv != CKR_OK) { > - show_error("do_VerifyTokenRSAKeyPair(1024)", rv); > + show_error("do_VerifyTokenSymKey(...AES_KEY...)", rv); > goto close_session; > } > } else { > - testcase_skip("VerifyTokenSymKey(...DES3_KEY...)"); > + testcase_skip("VerifyTokenSymKey(...AES_KEY...)"); > } > > close_session: > diff --git a/testcases/misc_tests/tok_obj.c b/testcases/misc_tests/tok_obj.c > old mode 100755 > new mode 100644 > diff --git a/testcases/misc_tests/tok_obj2.c b/testcases/misc_tests/tok_obj2.c > old mode 100755 > new mode 100644 > diff --git a/testcases/misc_tests/tok_rsa.c b/testcases/misc_tests/tok_rsa.c > index 3300711..29d1ca8 100644 > --- a/testcases/misc_tests/tok_rsa.c > +++ b/testcases/misc_tests/tok_rsa.c > @@ -67,7 +67,7 @@ do_VerifyTokenRSAKeyPair(CK_SESSION_HANDLE sess, CK_BYTE > *label, CK_ULONG bits) > } > > if (obj_class == CKO_PUBLIC_KEY) { > - CK_BYTE n[256], e[256]; > + CK_BYTE n[514], e[514]; > CK_ULONG exp_size = 0, mod_size = 0; > CK_ATTRIBUTE pub_attrs[] = { > { CKA_PUBLIC_EXPONENT, NULL, exp_size }, > @@ -81,7 +81,7 @@ do_VerifyTokenRSAKeyPair(CK_SESSION_HANDLE sess, CK_BYTE > *label, CK_ULONG bits) > } > > /* The public exponent is element 0 and modulus is > element 1 */ > - if (pub_attrs[0].ulValueLen > 256 || > pub_attrs[1].ulValueLen > 256) { > + if (pub_attrs[0].ulValueLen > 514 || > pub_attrs[1].ulValueLen > 514) { > PRINT_ERR("e_size (%lu) or n_size (%lu) too > big!", > pub_attrs[0].ulValueLen, > pub_attrs[1].ulValueLen); > return CKR_FUNCTION_FAILED; > @@ -133,7 +133,7 @@ do_GenerateTokenRSAKeyPair(CK_SESSION_HANDLE sess, > CK_BYTE *label, CK_ULONG bits > CK_RV rv; > CK_BBOOL true = 1; > > - printf("do_TokenGenerateRSAKey...\n"); > + printf("do_TokenGenerateRSAKey(%lu)...\n", bits); > > mech.mechanism = CKM_RSA_PKCS_KEY_PAIR_GEN; > mech.ulParameterLen = 0; > @@ -177,7 +177,7 @@ do_GenerateTokenRSAKeyPair(CK_SESSION_HANDLE sess, > CK_BYTE *label, CK_ULONG bits > main( int argc, char **argv ) > { > CK_C_INITIALIZE_ARGS cinit_args; > - int i; > + int i, bits; > CK_RV rv; > SLOT_ID = 0; > CK_BYTE user_pin[128]; > @@ -185,6 +185,8 @@ main( int argc, char **argv ) > CK_SLOT_ID slot_id; > CK_SESSION_HANDLE session; > CK_FLAGS flags; > + CK_MECHANISM_INFO rsakeygeninfo; > + CK_BYTE label[256]; > > > for (i=1; i < argc; i++) { > @@ -239,22 +241,58 @@ main( int argc, char **argv ) > return rv; > } > > - rv = do_GenerateTokenRSAKeyPair(session, (CK_BYTE *)"XXX DELETE ME TEST > LABEL 512bit", 512); > + rv = funcs->C_GetMechanismInfo(slot_id, CKM_RSA_PKCS_KEY_PAIR_GEN, > &rsakeygeninfo); > if (rv != CKR_OK) { > - show_error("do_GenerateTokenRSAKeyPair(512)", rv); > + show_error("C_GetMechanismInfo(CKM_RSA_PKCS_KEY_PAIR_GEN)", rv); > return -1; > } > > - rv = do_GenerateTokenRSAKeyPair(session, (CK_BYTE *)"XXX DELETE ME TEST > LABEL 1024bit", 1024); > - if (rv != CKR_OK) { > - show_error("do_GenerateTokenRSAKeyPair(1024)", rv); > - return -1; > + bits = 512; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_GenerateTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_GenerateTokenRSAKeyPair(512)", rv); > + return -1; > + } > + } else { > + testcase_skip("do_GenerateTokenRSAKeyPair(512)"); > } > > - rv = do_GenerateTokenRSAKeyPair(session, (CK_BYTE *)"XXX DELETE ME TEST > LABEL 2048bit", 2048); > - if (rv != CKR_OK) { > - show_error("do_GenerateTokenRSAKeyPair(2048)", rv); > - return -1; > + bits = 1024; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_GenerateTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_GenerateTokenRSAKeyPair(1024)", rv); > + return -1; > + } > + } else { > + testcase_skip("do_GenerateTokenRSAKeyPair(1024)"); > + } > + > + bits = 2048; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_GenerateTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_GenerateTokenRSAKeyPair(2048)", rv); > + return -1; > + } > + } else { > + testcase_skip("do_GenerateTokenRSAKeyPair(2048)"); > + } > + > + bits = 4096; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_GenerateTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_GenerateTokenRSAKeyPair(4096)", rv); > + return -1; > + } > + } else { > + testcase_skip("do_GenerateTokenRSAKeyPair(4096)"); > } > > rv = funcs->C_CloseSession( session ); > @@ -287,22 +325,44 @@ main( int argc, char **argv ) > goto close_session; > } > > - rv = do_VerifyTokenRSAKeyPair(session, (CK_BYTE *)"XXX DELETE ME TEST > LABEL 512bit", 512); > - if (rv != CKR_OK) { > - show_error("do_VerifyTokenRSAKeyPair(512)", rv); > - goto close_session; > + bits = 512; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_VerifyTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_VerifyTokenRSAKeyPair(512)", rv); > + goto close_session; > + } > } > > - rv = do_VerifyTokenRSAKeyPair(session, (CK_BYTE *)"XXX DELETE ME TEST > LABEL 1024bit", 1024); > - if (rv != CKR_OK) { > - show_error("do_VerifyTokenRSAKeyPair(1024)", rv); > - goto close_session; > + bits = 1024; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_VerifyTokenRSAKeyPair(session, label, 1024); > + if (rv != CKR_OK) { > + show_error("do_VerifyTokenRSAKeyPair(1024)", rv); > + goto close_session; > + } > } > > - rv = do_VerifyTokenRSAKeyPair(session, (CK_BYTE *)"XXX DELETE ME TEST > LABEL 2048bit", 2048); > - if (rv != CKR_OK) { > - show_error("do_VerifyTokenRSAKeyPair(2048)", rv); > + bits = 2048; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_VerifyTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_VerifyTokenRSAKeyPair(2048)", rv); > + } > } > + > + bits = 4096; > + if (bits >= rsakeygeninfo.ulMinKeySize && bits <= > rsakeygeninfo.ulMaxKeySize) { > + sprintf(label, "XXX DELETE ME TEST LABEL %dbit", bits); > + rv = do_VerifyTokenRSAKeyPair(session, label, bits); > + if (rv != CKR_OK) { > + show_error("do_VerifyTokenRSAKeyPair(4096)", rv); > + } > + } > + > close_session: > rv = funcs->C_CloseSession( session ); > if (rv != CKR_OK) { >
Patch accepted and merged into opencryptoki-v3.6.2. Thanks, Eduardo ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
