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

pkcs11-tool: disable wrap/unwrap test until OpenSC#1796 is resolved

This commit is contained in:
Carsten Blüggel 2021-04-07 02:50:34 +02:00 committed by Frank Morgner
parent 545e47b29e
commit edb7ed25e4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5746,7 +5746,7 @@ static int test_verify(CK_SESSION_HANDLE sess)
return errors; return errors;
} }
#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 21 #if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 22
#else #else
#ifdef ENABLE_OPENSSL #ifdef ENABLE_OPENSSL
static int wrap_unwrap(CK_SESSION_HANDLE session, static int wrap_unwrap(CK_SESSION_HANDLE session,
@ -5870,7 +5870,7 @@ static int wrap_unwrap(CK_SESSION_HANDLE session,
*/ */
static int test_unwrap(CK_SESSION_HANDLE sess) static int test_unwrap(CK_SESSION_HANDLE sess)
{ {
#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 21 #if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 22
/* temporarily disable test, see https://github.com/OpenSC/OpenSC/issues/1796 */ /* temporarily disable test, see https://github.com/OpenSC/OpenSC/issues/1796 */
return 0; return 0;
#else #else
@ -7520,7 +7520,7 @@ static void * test_threads_run(void * pttd)
pctest ++; pctest ++;
if (*pctest == ':') if (*pctest == ':')
pctest++; pctest++;
if (rv != CKR_OK && rv != CKR_CRYPTOKI_ALREADY_INITIALIZED) if (rv != CKR_OK && rv != CKR_CRYPTOKI_ALREADY_INITIALIZED)
/* IN C_Initialize with NULL args */ /* IN C_Initialize with NULL args */
@ -7562,7 +7562,7 @@ static int test_threads_cleanup()
if (ended == test_threads_num) { if (ended == test_threads_num) {
fprintf(stderr,"test_threads all threads have ended %s\n", fprintf(stderr,"test_threads all threads have ended %s\n",
(ended_ok == test_threads_num)? "with CKR_OK": "some errors"); (ended_ok == test_threads_num)? "with CKR_OK": "some errors");
break; break;
} else { } else {
fprintf(stderr,"test_threads threads stills active:%d\n", (test_threads_num - ended)); fprintf(stderr,"test_threads threads stills active:%d\n", (test_threads_num - ended));
for (i = 0; i < test_threads_num; i++) { for (i = 0; i < test_threads_num; i++) {
@ -7577,7 +7577,7 @@ static int test_threads_cleanup()
#endif #endif
} }
} }
for (i = 0; i < test_threads_num; i++) { for (i = 0; i < test_threads_num; i++) {
fprintf(stderr,"test_threads thread:%d state:%d, rv:%s\n", fprintf(stderr,"test_threads thread:%d state:%d, rv:%s\n",
i, test_threads_datas[i].state, CKR2Str(test_threads_datas[i].rv)); i, test_threads_datas[i].state, CKR2Str(test_threads_datas[i].rv));
@ -7595,11 +7595,11 @@ static int test_threads_cleanup()
fprintf(stderr,"test_threads cleanup finished\n"); fprintf(stderr,"test_threads cleanup finished\n");
return 0; return 0;
} }
static int test_threads_start(int tnum) static int test_threads_start(int tnum)
{ {
int r = 0; int r = 0;
#ifdef _WIN32 #ifdef _WIN32
test_threads_handles[tnum] = CreateThread(NULL, 0, test_threads_run, (LPVOID) &test_threads_datas[tnum], test_threads_handles[tnum] = CreateThread(NULL, 0, test_threads_run, (LPVOID) &test_threads_datas[tnum],
0, NULL); 0, NULL);
@ -7632,4 +7632,3 @@ static void test_threads()
} }
} }
#endif /* defined(_WIN32) || defiend(HAVE_PTHREAD) */ #endif /* defined(_WIN32) || defiend(HAVE_PTHREAD) */