108 lines
2.5 KiB
Diff
108 lines
2.5 KiB
Diff
--- testcases/login/login.c
|
|
+++ testcases/login/login.c
|
|
@@ -82,7 +82,7 @@
|
|
} else {
|
|
printf("usage: %s [-slot <num>] [-h] [-pass passwd] [-user|-so]\n\n", argv[0] );
|
|
printf("By default, Slot %d is used, as user\n\n", SLOT_ID_DEFAULT);
|
|
- return;
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
--- testcases/oc-digest/oc-digest.c
|
|
+++ testcases/oc-digest/oc-digest.c
|
|
@@ -164,7 +164,7 @@
|
|
|
|
if( (rc = funcs->C_Initialize( &initialize_args )) != CKR_OK ) {
|
|
oc_err_msg("C_Initialize", rc);
|
|
- return;
|
|
+ return clean_up();
|
|
}
|
|
|
|
/* stat the file for size, etc */
|
|
--- testcases/rsa_test/rsa_test_genkey.c
|
|
+++ testcases/rsa_test/rsa_test_genkey.c
|
|
@@ -544,7 +544,7 @@
|
|
printf("By default, Slot #1 is used\n\n");
|
|
printf("By default we skip anything that creates or modifies\n");
|
|
printf("token objects to preserve flash lifetime.\n");
|
|
- return;
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
@@ -552,7 +552,7 @@
|
|
|
|
rc = do_GetFunctionList();
|
|
if (!rc)
|
|
- return;
|
|
+ return 0;
|
|
|
|
memset( &cinit_args, 0x0, sizeof(cinit_args) );
|
|
cinit_args.flags = CKF_OS_LOCKING_OK;
|
|
@@ -564,7 +564,8 @@
|
|
|
|
rc = do_EncryptRSA_PKCS();
|
|
if (!rc)
|
|
- return;
|
|
+ return 0;
|
|
|
|
funcs->C_Finalize( NULL );
|
|
+ return 0;
|
|
}
|
|
--- testcases/rsa_test/rsa_thread_test.c
|
|
+++ testcases/rsa_test/rsa_thread_test.c
|
|
@@ -417,7 +417,7 @@
|
|
threads[index].processed = loopcount - failed;
|
|
threads[index].ops = (float) ((float)(loopcount - failed) / (float)diff);
|
|
|
|
- return;
|
|
+ return 0;
|
|
errordecrypt:
|
|
//if (len1 != len2) {
|
|
// printf(" ERROR: lengths don't match\n");
|
|
--- testcases/v2.11/aes_func.c
|
|
+++ testcases/v2.11/aes_func.c
|
|
@@ -1946,7 +1946,7 @@
|
|
|
|
if ((rc = funcs->C_Initialize(&initialize_args)) != CKR_OK) {
|
|
OC_ERR_MSG("C_Initialize", rc);
|
|
- return;
|
|
+ return 0;
|
|
}
|
|
|
|
|
|
--- testcases/v2.11/hw_fn.c
|
|
+++ testcases/v2.11/hw_fn.c
|
|
@@ -289,7 +289,7 @@
|
|
|
|
if( (rc = funcs->C_Initialize( &initialize_args )) != CKR_OK ) {
|
|
OC_ERR_MSG("C_Initialize", rc);
|
|
- return;
|
|
+ return 0;
|
|
}
|
|
|
|
/* Open a session with the token */
|
|
--- testcases/v2.11/login.c
|
|
+++ testcases/v2.11/login.c
|
|
@@ -63,7 +63,7 @@
|
|
|
|
if( (rc = funcs->C_Initialize( &initialize_args )) != CKR_OK ) {
|
|
oc_err_msg("C_Initialize", rc);
|
|
- return;
|
|
+ return 0;
|
|
}
|
|
|
|
//
|
|
--- testcases/v2.11/rijndael.c
|
|
+++ testcases/v2.11/rijndael.c
|
|
@@ -925,7 +925,7 @@
|
|
|
|
if( (rc = funcs->C_Initialize( &initialize_args )) != CKR_OK ) {
|
|
OC_ERR_MSG("C_Initialize", rc);
|
|
- return;
|
|
+ return 0;
|
|
}
|
|
|
|
/* Open a session with the token */
|