- fix compile warnings generated by -Wall - always return a non-zero error code to the command line on test error - use a macro to send output to stderr when appropriate - print file/line numbers for any failures
Signed-off-by: Kent Yoder <[email protected]> testcases/driver/des3_func.c | 450 +++++++++++++++++++++--------------------- 1 files changed, 226 insertions(+), 224 deletions(-) diff --git a/testcases/driver/des3_func.c b/testcases/driver/des3_func.c index 7470a63..4691c81 100755 --- a/testcases/driver/des3_func.c +++ b/testcases/driver/des3_func.c @@ -11,7 +11,7 @@ // // -int do_Encrypt3DES_ECB( void ) +CK_RV do_Encrypt3DES_ECB( void ) { CK_BYTE data1[BIG_REQUEST]; CK_BYTE data2[BIG_REQUEST]; @@ -24,7 +24,7 @@ int do_Encrypt3DES_ECB( void ) CK_ULONG user_pin_len; CK_ULONG i; CK_ULONG len1, len2; - CK_RV rc; + CK_RV rc, loc_rc; printf("do_Encrypt3DES_ECB...\n"); @@ -33,7 +33,7 @@ int do_Encrypt3DES_ECB( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -101,13 +101,13 @@ int do_Encrypt3DES_ECB( void ) } if (len1 != len2) { - printf(" ERROR: lengths don't match\n"); + PRINT_ERR(" ERROR: lengths don't match\n"); goto error; } for (i=0; i <len1; i++) { if (data1[i] != data2[i]) { - printf(" ERROR: mismatch at byte %ld\n", i ); + PRINT_ERR(" ERROR: mismatch at byte %ld\n", i ); goto error; } } @@ -115,24 +115,24 @@ int do_Encrypt3DES_ECB( void ) rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; error: - rc = funcs->C_CloseSession (session); - if (rc != CKR_OK) - show_error (" C_CloseSession #2", rc); + loc_rc = funcs->C_CloseSession (session); + if (loc_rc != CKR_OK) + show_error (" C_CloseSession #2", loc_rc); - return FALSE; + return rc; } // // -int do_Encrypt3DES_Multipart_ECB( void ) +CK_RV do_Encrypt3DES_Multipart_ECB( void ) { CK_BYTE original[BIG_REQUEST]; CK_BYTE crypt1 [BIG_REQUEST]; @@ -151,7 +151,7 @@ int do_Encrypt3DES_Multipart_ECB( void ) CK_ULONG orig_len; CK_ULONG crypt1_len, crypt2_len, decrypt1_len, decrypt2_len; CK_ULONG tmp; - CK_RV rc; + CK_RV rc, loc_rc; printf("do_Encrypt3DES_Multipart_ECB...\n"); @@ -160,7 +160,7 @@ int do_Encrypt3DES_Multipart_ECB( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -258,12 +258,12 @@ int do_Encrypt3DES_Multipart_ECB( void ) } if (tmp != 0) { - printf(" ERROR: DecryptFinal wants to return %ld bytes\n", tmp ); + PRINT_ERR(" ERROR: DecryptFinal wants to return %ld bytes\n", tmp ); goto error; } if (crypt2_len != crypt1_len) { - printf(" ERROR: crypt1_len = %ld, crypt2_len = %ld\n", crypt1_len, crypt2_len ); + PRINT_ERR(" ERROR: crypt1_len = %ld, crypt2_len = %ld\n", crypt1_len, crypt2_len ); goto error; } @@ -272,7 +272,7 @@ int do_Encrypt3DES_Multipart_ECB( void ) // for (i=0; i < crypt1_len; i++) { if (crypt1[i] != crypt2[i]) { - printf(" ERROR: mismatch. crypt1 != crypt2 at byte %ld\n", i ); + PRINT_ERR(" ERROR: mismatch. crypt1 != crypt2 at byte %ld\n", i ); goto error; } } @@ -336,17 +336,17 @@ int do_Encrypt3DES_Multipart_ECB( void ) } if (tmp != 0) { - printf(" ERROR: DecryptFinal wants to return %ld bytes\n", tmp ); + PRINT_ERR(" ERROR: DecryptFinal wants to return %ld bytes\n", tmp ); goto error; } if (decrypt1_len != decrypt2_len) { - printf(" ERROR: decrypt1_len = %ld, decrypt2_len = %ld\n", decrypt1_len, decrypt2_len ); + PRINT_ERR(" ERROR: decrypt1_len = %ld, decrypt2_len = %ld\n", decrypt1_len, decrypt2_len ); goto error; } if (decrypt1_len != orig_len) { - printf(" ERROR: decrypted lengths = %ld, original length = %ld\n", decrypt1_len, orig_len ); + PRINT_ERR(" ERROR: decrypted lengths = %ld, original length = %ld\n", decrypt1_len, orig_len ); goto error; } @@ -354,7 +354,7 @@ int do_Encrypt3DES_Multipart_ECB( void ) // for (i=0; i < decrypt1_len; i++) { if (decrypt1[i] != decrypt2[i]) { - printf(" ERROR: mismatch. decrypt1 != decrypt2 at byte %ld\n", i ); + PRINT_ERR(" ERROR: mismatch. decrypt1 != decrypt2 at byte %ld\n", i ); goto error; } } @@ -363,7 +363,7 @@ int do_Encrypt3DES_Multipart_ECB( void ) // for (i=0; i < orig_len; i++) { if (original[i] != decrypt1[i]) { - printf(" ERROR: decrypted mismatch: original != decrypt at byte %ld\n", i ); + PRINT_ERR(" ERROR: decrypted mismatch: original != decrypt at byte %ld\n", i ); goto error; } } @@ -372,24 +372,24 @@ int do_Encrypt3DES_Multipart_ECB( void ) rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; error: - rc = funcs->C_CloseSession (session); - if (rc != CKR_OK) - show_error (" C_CloseSession #2", rc); + loc_rc = funcs->C_CloseSession (session); + if (loc_rc != CKR_OK) + show_error (" C_CloseSession #2", loc_rc); - return FALSE; + return rc; } // // -int do_Encrypt3DES_CBC( void ) +CK_RV do_Encrypt3DES_CBC( void ) { CK_BYTE data1[BIG_REQUEST]; CK_BYTE data2[BIG_REQUEST]; @@ -412,7 +412,7 @@ int do_Encrypt3DES_CBC( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -423,7 +423,7 @@ int do_Encrypt3DES_CBC( void ) rc = funcs->C_Login( session, CKU_USER, user_pin, user_pin_len ); if (rc != CKR_OK) { show_error(" C_Login #1", rc ); - return FALSE; + return rc; } @@ -437,7 +437,7 @@ int do_Encrypt3DES_CBC( void ) rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &h_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #1", rc ); - return FALSE; + return rc; } @@ -459,13 +459,13 @@ int do_Encrypt3DES_CBC( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #1", rc ); - return FALSE; + return rc; } rc = funcs->C_Encrypt( session, data1, len1, data1, &len1 ); if (rc != CKR_OK) { show_error(" C_Encrypt #1", rc ); - return FALSE; + return rc; } // now, decrypt the data @@ -473,41 +473,41 @@ int do_Encrypt3DES_CBC( void ) rc = funcs->C_DecryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } rc = funcs->C_Decrypt( session, data1, len1, data1, &len1 ); if (rc != CKR_OK) { show_error(" C_Decrypt #1", rc ); - return FALSE; + return rc; } if (len1 != len2) { - printf(" ERROR: lengths don't match\n"); - return FALSE; + PRINT_ERR(" ERROR: lengths don't match\n"); + return -1; } for (i=0; i <len1; i++) { if (data1[i] != data2[i]) { - printf(" ERROR: mismatch at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: mismatch at byte %ld\n", i ); + return -1; } } rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; } // // -int do_Encrypt3DES_Multipart_CBC( void ) +CK_RV do_Encrypt3DES_Multipart_CBC( void ) { CK_BYTE original[BIG_REQUEST]; CK_BYTE crypt1 [BIG_REQUEST]; @@ -536,7 +536,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -547,7 +547,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_Login( session, CKU_USER, user_pin, user_pin_len ); if (rc != CKR_OK) { show_error(" C_Login #1", rc ); - return FALSE; + return rc; } mech.mechanism = CKM_DES3_KEY_GEN; @@ -560,7 +560,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &h_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #1", rc ); - return FALSE; + return rc; } @@ -580,7 +580,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #1", rc ); - return FALSE; + return rc; } // use normal ecb mode to encrypt data1 @@ -589,7 +589,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_Encrypt( session, original, orig_len, crypt1, &crypt1_len ); if (rc != CKR_OK) { show_error(" C_Encrypt #1", rc ); - return FALSE; + return rc; } // use multipart cbc mode to encrypt data2 in 1024 byte chunks @@ -597,7 +597,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #2", rc ); - return FALSE; + return rc; } i = k = 0; @@ -618,7 +618,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) &crypt2[k], &tmp ); if (rc != CKR_OK) { show_error(" C_EncryptUpdate #1", rc ); - return FALSE; + return rc; } k += tmp; @@ -630,26 +630,26 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_EncryptFinal( session, NULL, &tmp ); if (rc != CKR_OK) { show_error(" C_EncryptFinal #2", rc ); - return FALSE; + return rc; } if (tmp != 0) { - printf(" ERROR: EncryptFinal wants to return %ld bytes\n", tmp ); - return FALSE; + PRINT_ERR(" ERROR: EncryptFinal wants to return %ld bytes\n", tmp ); + return -1; } if (crypt2_len != crypt1_len) { - printf(" ERROR: crypt1_len = %ld, crypt2_len = %ld\n", crypt1_len, crypt2_len ); - return FALSE; + PRINT_ERR(" ERROR: crypt1_len = %ld, crypt2_len = %ld\n", crypt1_len, crypt2_len ); + return -1; } // compare both encrypted blocks. they'd better be equal // for (i=0; i < crypt1_len; i++) { if (crypt1[i] != crypt2[i]) { - printf(" ERROR: mismatch. crypt1 != crypt2 at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: mismatch. crypt1 != crypt2 at byte %ld\n", i ); + return -1; } } @@ -660,14 +660,14 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_DecryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } decrypt1_len = sizeof(decrypt1); rc = funcs->C_Decrypt( session, crypt1, crypt1_len, decrypt1, &decrypt1_len ); if (rc != CKR_OK) { show_error(" C_Decrypt #1", rc ); - return FALSE; + return rc; } // use multipart cbc mode to encrypt data2 in 1024 byte chunks @@ -675,7 +675,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_DecryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } @@ -697,7 +697,7 @@ int do_Encrypt3DES_Multipart_CBC( void ) &decrypt2[k], &tmp ); if (rc != CKR_OK) { show_error(" C_DecryptUpdate #1", rc ); - return FALSE; + return rc; } k += tmp; @@ -709,25 +709,25 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_DecryptFinal( session, NULL, &tmp ); if (rc != CKR_OK) { show_error(" C_DecryptFinal #2", rc ); - return FALSE; + return rc; } if (tmp != 0) { - printf(" ERROR: DecryptFinal wants to return %ld bytes\n", tmp ); - return FALSE; + PRINT_ERR(" ERROR: DecryptFinal wants to return %ld bytes\n", tmp ); + return -1; } if (decrypt2_len != decrypt1_len) { - printf(" ERROR: decrypt1_len = %ld, decrypt2_len = %ld\n", decrypt1_len, decrypt2_len ); - return FALSE; + PRINT_ERR(" ERROR: decrypt1_len = %ld, decrypt2_len = %ld\n", decrypt1_len, decrypt2_len ); + return -1; } // compare both decrypted blocks. they'd better be equal // for (i=0; i < decrypt1_len; i++) { if (crypt1[i] != crypt2[i]) { - printf(" ERROR: mismatch. decrypt1 != decrypt2 at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: mismatch. decrypt1 != decrypt2 at byte %ld\n", i ); + return -1; } } @@ -735,8 +735,8 @@ int do_Encrypt3DES_Multipart_CBC( void ) // for (i=0; i < orig_len; i++) { if (original[i] != decrypt1[i]) { - printf(" ERROR: decrypted mismatch: original != decrypt at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: decrypted mismatch: original != decrypt at byte %ld\n", i ); + return -1; } } @@ -744,17 +744,17 @@ int do_Encrypt3DES_Multipart_CBC( void ) rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; } // // -int do_EncryptDES3_Multipart_CBC_PAD( void ) +CK_RV do_EncryptDES3_Multipart_CBC_PAD( void ) { CK_BYTE original[BIG_REQUEST]; @@ -784,7 +784,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -795,7 +795,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_Login( session, CKU_USER, user_pin, user_pin_len ); if (rc != CKR_OK) { show_error(" C_Login #1", rc ); - return FALSE; + return rc; } mech.mechanism = CKM_DES3_KEY_GEN; @@ -808,7 +808,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &h_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #1", rc ); - return FALSE; + return rc; } @@ -829,7 +829,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #1", rc ); - return FALSE; + return rc; } // use normal ecb mode to encrypt data1 @@ -838,7 +838,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_Encrypt( session, original, orig_len, crypt1, &crypt1_len ); if (rc != CKR_OK) { show_error(" C_Encrypt #1", rc ); - return FALSE; + return rc; } // use multipart cbc mode to encrypt data2 in chunks @@ -846,7 +846,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #2", rc ); - return FALSE; + return rc; } i = k = 0; @@ -867,7 +867,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) &crypt2[k], &len ); if (rc != CKR_OK) { show_error(" C_EncryptUpdate #1", rc ); - return FALSE; + return rc; } k += len; @@ -879,23 +879,23 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_EncryptFinal( session, &crypt2[k], &crypt2_len ); if (rc != CKR_OK) { show_error(" C_EncryptFinal #2", rc ); - return FALSE; + return rc; } crypt2_len += k; if (crypt2_len != crypt1_len) { - printf(" ERROR: encrypted lengths don't match\n"); - printf(" crypt2_len == %ld, crypt1_len == %ld\n", crypt2_len, crypt1_len ); - return FALSE; + PRINT_ERR(" ERROR: encrypted lengths don't match\n"); + PRINT_ERR(" crypt2_len == %ld, crypt1_len == %ld\n", crypt2_len, crypt1_len ); + return -1; } // compare both encrypted blocks. they'd better be equal // for (i=0; i < crypt2_len; i++) { if (crypt1[i] != crypt2[i]) { - printf(" ERROR: encrypted mismatch: crypt1 != crypt2 at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: encrypted mismatch: crypt1 != crypt2 at byte %ld\n", i ); + return -1; } } @@ -906,14 +906,14 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_DecryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } decrypt1_len = sizeof(decrypt1); rc = funcs->C_Decrypt( session, crypt1, crypt1_len, decrypt1, &decrypt1_len ); if (rc != CKR_OK) { show_error(" C_Decrypt #1", rc ); - return FALSE; + return rc; } // use multipart cbc mode to encrypt data2 in 1024 byte chunks @@ -921,7 +921,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_DecryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } @@ -943,7 +943,7 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) &decrypt2[k], &len ); if (rc != CKR_OK) { show_error(" C_DecryptUpdate #1", rc ); - return FALSE; + return rc; } k += len; @@ -955,21 +955,21 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_DecryptFinal( session, &decrypt2[k], &decrypt2_len ); if (rc != CKR_OK) { show_error(" C_DecryptFinal #2", rc ); - return FALSE; + return rc; } decrypt2_len += k; if (decrypt2_len != decrypt1_len) { - printf(" ERROR: decrypted lengths don't match\n"); - printf(" decrypt1_len == %ld, decrypt2_len == %ld\n", decrypt1_len, decrypt2_len ); - return FALSE; + PRINT_ERR(" ERROR: decrypted lengths don't match\n"); + PRINT_ERR(" decrypt1_len == %ld, decrypt2_len == %ld\n", decrypt1_len, decrypt2_len ); + return -1; } if (decrypt2_len != orig_len) { - printf(" ERROR: decrypted lengths don't match the original\n"); - printf(" decrypt_len == %ld, orig_len == %ld\n", decrypt1_len, orig_len ); - return FALSE; + PRINT_ERR(" ERROR: decrypted lengths don't match the original\n"); + PRINT_ERR(" decrypt_len == %ld, orig_len == %ld\n", decrypt1_len, orig_len ); + return -1; } @@ -977,8 +977,8 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) // for (i=0; i < decrypt1_len; i++) { if (decrypt1[i] != decrypt2[i]) { - printf(" ERROR: decrypted mismatch: data1 != data2 at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: decrypted mismatch: data1 != data2 at byte %ld\n", i ); + return -1; } } @@ -986,8 +986,8 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) // for (i=0; i < orig_len; i++) { if (original[i] != decrypt2[i]) { - printf(" ERROR: decrypted mismatch: original != decrypted at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: decrypted mismatch: original != decrypted at byte %ld\n", i ); + return -1; } } @@ -995,17 +995,17 @@ int do_EncryptDES3_Multipart_CBC_PAD( void ) rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; } // // -int do_WrapUnwrapDES3_ECB( void ) +CK_RV do_WrapUnwrapDES3_ECB( void ) { CK_BYTE data1[BIG_REQUEST]; CK_BYTE data2[BIG_REQUEST]; @@ -1022,7 +1022,7 @@ int do_WrapUnwrapDES3_ECB( void ) CK_ULONG wrapped_data_len; CK_ULONG i; CK_ULONG len1, len2; - CK_RV rc; + CK_RV rc, loc_rc; CK_OBJECT_CLASS key_class = CKO_SECRET_KEY; CK_KEY_TYPE key_type = CKK_DES3; @@ -1041,7 +1041,7 @@ int do_WrapUnwrapDES3_ECB( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -1139,13 +1139,13 @@ int do_WrapUnwrapDES3_ECB( void ) } if (len1 != len2) { - printf(" ERROR: lengths don't match\n"); + PRINT_ERR(" ERROR: lengths don't match\n"); goto error; } for (i=0; i <len1; i++) { if (data1[i] != data2[i]) { - printf(" ERROR: mismatch at byte %ld\n", i ); + PRINT_ERR(" ERROR: mismatch at byte %ld\n", i ); goto error; } } @@ -1194,7 +1194,7 @@ int do_WrapUnwrapDES3_ECB( void ) data, &data_len ); if (rc != CKR_KEY_NOT_WRAPPABLE) { show_error(" C_WrapKey #2", rc ); - printf(" Expected CKR_KEY_NOT_WRAPPABLE\n" ); + PRINT_ERR(" Expected CKR_KEY_NOT_WRAPPABLE\n" ); goto error; } } @@ -1202,24 +1202,24 @@ int do_WrapUnwrapDES3_ECB( void ) rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; error: - rc = funcs->C_CloseSession (session); - if (rc != CKR_OK) - show_error (" C_CloseSession #2", rc); + loc_rc = funcs->C_CloseSession (session); + if (loc_rc != CKR_OK) + show_error (" C_CloseSession #2", loc_rc); - return FALSE; + return rc; } // // -int do_WrapUnwrapDES3_CBC( void ) +CK_RV do_WrapUnwrapDES3_CBC( void ) { CK_BYTE data1[BIG_REQUEST]; CK_BYTE data2[BIG_REQUEST]; @@ -1256,7 +1256,7 @@ int do_WrapUnwrapDES3_CBC( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -1267,7 +1267,7 @@ int do_WrapUnwrapDES3_CBC( void ) rc = funcs->C_Login( session, CKU_USER, user_pin, user_pin_len ); if (rc != CKR_OK) { show_error(" C_Login #1", rc ); - return FALSE; + return rc; } mech.mechanism = CKM_DES3_KEY_GEN; @@ -1280,13 +1280,13 @@ int do_WrapUnwrapDES3_CBC( void ) rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &h_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #1", rc ); - return FALSE; + return rc; } rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &w_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #2", rc ); - return FALSE; + return rc; } @@ -1306,13 +1306,13 @@ int do_WrapUnwrapDES3_CBC( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #1", rc ); - return FALSE; + return rc; } rc = funcs->C_Encrypt( session, data1, len1, data1, &len1 ); if (rc != CKR_OK) { show_error(" C_Encrypt #1", rc ); - return FALSE; + return rc; } @@ -1325,7 +1325,7 @@ int do_WrapUnwrapDES3_CBC( void ) (CK_BYTE *)&wrapped_data, &wrapped_data_len ); if (rc != CKR_OK) { show_error(" C_WrapKey #1", rc ); - return FALSE; + return rc; } rc = funcs->C_UnwrapKey( session, &mech, @@ -1335,7 +1335,7 @@ int do_WrapUnwrapDES3_CBC( void ) &uw_key ); if (rc != CKR_OK) { show_error(" C_UnWrapKey #1", rc ); - return FALSE; + return rc; } @@ -1344,24 +1344,24 @@ int do_WrapUnwrapDES3_CBC( void ) rc = funcs->C_DecryptInit( session, &mech, uw_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } rc = funcs->C_Decrypt( session, data1, len1, data1, &len1 ); if (rc != CKR_OK) { show_error(" C_Decrypt #1", rc ); - return FALSE; + return rc; } if (len1 != len2) { - printf(" ERROR: lengths don't match\n"); - return FALSE; + PRINT_ERR(" ERROR: lengths don't match\n"); + return -1; } for (i=0; i <len1; i++) { if (data1[i] != data2[i]) { - printf(" ERROR: mismatch at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: mismatch at byte %ld\n", i ); + return -1; } } @@ -1401,7 +1401,7 @@ int do_WrapUnwrapDES3_CBC( void ) rc = funcs->C_CreateObject( session, tmpl, 10, &priv_key ); if (rc != CKR_OK) { show_error(" C_CreateObject #1", rc ); - return FALSE; + return rc; } rc = funcs->C_WrapKey( session, &mech, @@ -1409,25 +1409,25 @@ int do_WrapUnwrapDES3_CBC( void ) data, &data_len ); if (rc != CKR_KEY_NOT_WRAPPABLE) { show_error(" C_WrapKey #2", rc ); - printf(" Expected CKR_KEY_NOT_WRAPPABLE\n" ); - return FALSE; + PRINT_ERR(" Expected CKR_KEY_NOT_WRAPPABLE\n" ); + return rc; } } rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; + return rc; } printf("Success.\n"); - return TRUE; + return 0; } // // -int do_WrapUnwrapDES3_CBC_PAD( void ) +CK_RV do_WrapUnwrapDES3_CBC_PAD( void ) { CK_BYTE original[BIG_REQUEST]; CK_BYTE cipher [BIG_REQUEST + 8]; @@ -1467,7 +1467,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_OpenSession( slot_id, flags, NULL, NULL, &session ); if (rc != CKR_OK) { show_error(" C_OpenSession #1", rc ); - return FALSE; + return rc; } @@ -1478,7 +1478,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_Login( session, CKU_USER, user_pin, user_pin_len ); if (rc != CKR_OK) { show_error(" C_Login #1", rc ); - return FALSE; + return rc; } mech.mechanism = CKM_DES3_KEY_GEN; @@ -1491,13 +1491,13 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &h_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #1", rc ); - return FALSE; + return rc; } rc = funcs->C_GenerateKey( session, &mech, NULL, 0, &w_key ); if (rc != CKR_OK) { show_error(" C_GenerateKey #2", rc ); - return FALSE; + return rc; } @@ -1515,14 +1515,14 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_EncryptInit( session, &mech, h_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #1", rc ); - return FALSE; + return rc; } cipher_len = sizeof(cipher); rc = funcs->C_Encrypt( session, original, orig_len, cipher, &cipher_len ); if (rc != CKR_OK) { show_error(" C_Encrypt #1", rc ); - return FALSE; + return rc; } @@ -1535,7 +1535,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) wrapped_data, &wrapped_data_len ); if (rc != CKR_OK) { show_error(" C_WrapKey #1", rc ); - return FALSE; + return rc; } rc = funcs->C_UnwrapKey( session, &mech, @@ -1545,7 +1545,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) &uw_key ); if (rc != CKR_OK) { show_error(" C_UnWrapKey #1", rc ); - return FALSE; + return rc; } @@ -1554,25 +1554,25 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_DecryptInit( session, &mech, uw_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } decipher_len = sizeof(decipher); rc = funcs->C_Decrypt( session, cipher, cipher_len, decipher, &decipher_len ); if (rc != CKR_OK) { show_error(" C_Decrypt #1", rc ); - return FALSE; + return rc; } if (orig_len != decipher_len) { - printf(" ERROR: lengths don't match: %ld vs %ld\n", orig_len, decipher_len ); - return FALSE; + PRINT_ERR(" ERROR: lengths don't match: %ld vs %ld\n", orig_len, decipher_len ); + return -1; } for (i=0; i < orig_len; i++) { if (original[i] != decipher[i]) { - printf(" ERROR: mismatch at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: mismatch at byte %ld\n", i ); + return -1; } } @@ -1607,7 +1607,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) &publ_key, &priv_key ); if (rc != CKR_OK) { show_error(" C_GenerateKeyPair #1", rc ); - return FALSE; + return rc; } @@ -1620,7 +1620,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) wrapped_data, &wrapped_data_len ); if (rc != CKR_OK) { show_error(" C_WrapKey #2", rc ); - return FALSE; + return rc; } rc = funcs->C_UnwrapKey( session, &mech, @@ -1630,7 +1630,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) &uw_key ); if (rc != CKR_OK) { show_error(" C_UnWrapKey #2", rc ); - return FALSE; + return rc; } // encrypt something with the public key @@ -1642,7 +1642,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_EncryptInit( session, &mech2, publ_key ); if (rc != CKR_OK) { show_error(" C_EncryptInit #2", rc ); - return FALSE; + return rc; } // for RSA operations, keep the input data size smaller than @@ -1654,7 +1654,7 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_Encrypt( session, original, orig_len, cipher, &cipher_len ); if (rc != CKR_OK) { show_error(" C_Encrypt #2", rc ); - return FALSE; + return rc; } // now, decrypt the data using the unwrapped private key. @@ -1662,25 +1662,25 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_DecryptInit( session, &mech2, uw_key ); if (rc != CKR_OK) { show_error(" C_DecryptInit #1", rc ); - return FALSE; + return rc; } decipher_len = sizeof(decipher); rc = funcs->C_Decrypt( session, cipher, cipher_len, decipher, &decipher_len ); if (rc != CKR_OK) { show_error(" C_Decrypt #1", rc ); - return FALSE; + return rc; } if (orig_len != decipher_len) { - printf(" ERROR: lengths don't match: %ld vs %ld\n", orig_len, decipher_len ); - return FALSE; + PRINT_ERR(" ERROR: lengths don't match: %ld vs %ld\n", orig_len, decipher_len ); + return -1; } for (i=0; i < orig_len; i++) { if (original[i] != decipher[i]) { - printf(" ERROR: mismatch at byte %ld\n", i ); - return FALSE; + PRINT_ERR(" ERROR: mismatch at byte %ld\n", i ); + return -1; } } } @@ -1688,64 +1688,22 @@ int do_WrapUnwrapDES3_CBC_PAD( void ) rc = funcs->C_CloseAllSessions( slot_id ); if (rc != CKR_OK) { show_error(" C_CloseAllSessions #1", rc ); - return FALSE; - } - - printf("Success.\n"); - return TRUE; -} - -int main(int argc, char **argv) -{ - CK_C_INITIALIZE_ARGS cinit_args; - int rc, i; - - - rc = do_ParseArgs(argc, argv); - if ( rc != 1) - return rc; - - printf("Using slot #%lu...\n\n", SLOT_ID ); - printf("With option: no_init: %d\n", no_init); - - rc = do_GetFunctionList(); - if (!rc) { - fprintf(stderr, "ERROR do_GetFunctionList() Failed , rc = 0x%0x\n", rc); return rc; } - - memset( &cinit_args, 0x0, sizeof(cinit_args) ); - cinit_args.flags = CKF_OS_LOCKING_OK; - - // SAB Add calls to ALL functions before the C_Initialize gets hit - - funcs->C_Initialize( &cinit_args ); - - { - CK_SESSION_HANDLE hsess = 0; - - rc = funcs->C_GetFunctionStatus(hsess); - if (rc != CKR_FUNCTION_NOT_PARALLEL) - return rc; - - rc = funcs->C_CancelFunction(hsess); - if (rc != CKR_FUNCTION_NOT_PARALLEL) - return rc; - - } - des3_functions(); + printf("Success.\n"); + return 0; } -int des3_functions() +CK_RV des3_functions() { SYSTEMTIME t1, t2; - int rc; + CK_RV rc; GetSystemTime(&t1); rc = do_Encrypt3DES_ECB(); - if (!rc) { - fprintf (stderr, "ERROR do_Encrypt3DES_ECB failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_Encrypt3DES_ECB failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1754,8 +1712,8 @@ int des3_functions() GetSystemTime(&t1); rc = do_Encrypt3DES_CBC(); - if (!rc) { - fprintf (stderr, "ERROR do_Encrypt3DES_CBC failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_Encrypt3DES_CBC failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1764,8 +1722,8 @@ int des3_functions() GetSystemTime(&t1); rc = do_Encrypt3DES_Multipart_ECB(); - if (!rc) { - fprintf (stderr, "ERROR do_Encrypt3DES_Multipart_ECB failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_Encrypt3DES_Multipart_ECB failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1774,8 +1732,8 @@ int des3_functions() GetSystemTime(&t1); rc = do_Encrypt3DES_Multipart_CBC(); - if (!rc) { - fprintf (stderr, "ERROR do_Encrypt3DES_Multipart_CBC failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_Encrypt3DES_Multipart_CBC failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1784,8 +1742,8 @@ int des3_functions() GetSystemTime(&t1); rc = do_EncryptDES3_Multipart_CBC_PAD(); - if (!rc) { - fprintf (stderr, "ERROR do_EncryptDES3_Multipart_CBC_PAD failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_EncryptDES3_Multipart_CBC_PAD failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1794,8 +1752,8 @@ int des3_functions() GetSystemTime(&t1); rc = do_WrapUnwrapDES3_ECB(); - if (!rc) { - fprintf (stderr, "ERROR do_WrapUnwrapDES3_EBC failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_WrapUnwrapDES3_EBC failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1804,8 +1762,8 @@ int des3_functions() GetSystemTime(&t1); rc = do_WrapUnwrapDES3_CBC(); - if (!rc) { - fprintf (stderr, "ERROR do_WrapUnwrapDES3_CBC failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_WrapUnwrapDES3_CBC failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } @@ -1814,15 +1772,59 @@ int des3_functions() GetSystemTime(&t1); rc = do_WrapUnwrapDES3_CBC_PAD(); - if (!rc) { - fprintf (stderr, "ERROR do_WrapUnwrapDES3_CBC_PAD failed, rc = 0x%0x\n", rc); + if (rc) { + PRINT_ERR("ERROR do_WrapUnwrapDES3_CBC_PAD failed, rc = 0x%lx\n", rc); if (!no_stop) return rc; } GetSystemTime(&t2); process_time( t1, t2 ); - return TRUE; + return 0; +} + +int main(int argc, char **argv) +{ + CK_C_INITIALIZE_ARGS cinit_args; + int rc; + CK_RV rv; + + rc = do_ParseArgs(argc, argv); + if ( rc != 1) + return rc; + + printf("Using slot #%lu...\n\n", SLOT_ID ); + printf("With option: no_init: %d\n", no_init); + + rc = do_GetFunctionList(); + if (!rc) { + PRINT_ERR("ERROR do_GetFunctionList() Failed , rc = 0x%0x\n", rc); + return rc; + } + + memset( &cinit_args, 0x0, sizeof(cinit_args) ); + cinit_args.flags = CKF_OS_LOCKING_OK; + + // SAB Add calls to ALL functions before the C_Initialize gets hit + + funcs->C_Initialize( &cinit_args ); + + { + CK_SESSION_HANDLE hsess = 0; + + rc = funcs->C_GetFunctionStatus(hsess); + if (rc != CKR_FUNCTION_NOT_PARALLEL) + return rc; + + rc = funcs->C_CancelFunction(hsess); + if (rc != CKR_FUNCTION_NOT_PARALLEL) + return rc; + + } + + rv = des3_functions(); + /* make sure we return non-zero if rv is non-zero */ + return ((rv==0) || (rv % 256) ? rv : -1); } ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
