Fix AES and OAEP parameter checks and output lengths

.github/workflows/unit-test.yml

@@ -21,6 +21,11 @@ jobs:
     with:
       config: --enable-singlethreaded --enable-wolftpm --disable-dh C_EXTRA_FLAGS="-DWOLFPKCS11_TPM_STORE"
       check: ./tests/pkcs11str && ./tests/pkcs11test && ./tests/rsa_session_persistence_test
+  tpm_debug:
+    uses: ./.github/workflows/build-workflow.yml
+    with:
+      config: --enable-singlethreaded --enable-wolftpm --disable-dh --enable-debug C_EXTRA_FLAGS="-DWOLFPKCS11_TPM_STORE"
+      check: ./tests/token_store_test
 
   no_rsa:
     uses: ./.github/workflows/build-workflow.yml
@@ -50,6 +55,11 @@ jobs:
     uses: ./.github/workflows/build-workflow.yml
     with:
       config: CFLAGS="-DWOLFPKCS11_NO_STORE"
+  no_env:
+    uses: ./.github/workflows/build-workflow.yml
+    with:
+      config: C_EXTRA_FLAGS="-DWOLFPKCS11_NO_ENV -DWOLFPKCS11_DEFAULT_TOKEN_PATH=./store/default"
+      check: mkdir -p store && ./tests/pkcs11test
   no_aesgcm:
     uses: ./.github/workflows/build-workflow.yml
     with:

CMakeLists.txt

@@ -158,8 +158,7 @@ if(NOT WOLFPKCS11_SINGLE_THREADED)
             "-D_POSIX_THREADS")
     endif()
 else()
-    set(SINGLE_THREADED 1)
-    list(APPEND WOLFPKCS11_DEFINITIONS "-DSINGLE_THREADED")
+    list(APPEND WOLFPKCS11_DEFINITIONS "-DWOLFPKCS11_SINGLE_THREADED")
 endif()
 
 

cmake/options.h.in

@@ -38,8 +38,8 @@ extern "C" {
 #endif
 #undef DEBUG_WOLFPKCS11
 #cmakedefine DEBUG_WOLFPKCS11
-#undef SINGLE_THREADED
-#cmakedefine SINGLE_THREADED
+#undef WOLFPKCS11_SINGLE_THREADED
+#cmakedefine WOLFPKCS11_SINGLE_THREADED
 #undef NO_RSA
 #cmakedefine NO_RSA
 #undef WC_NO_RSA_OAEP

configure.ac

@@ -127,7 +127,7 @@ AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
                       ])
       ])
 
-AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xyes" ],[ AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS" ])
+AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xyes" ],[ AM_CFLAGS="-DWOLFPKCS11_SINGLE_THREADED $AM_CFLAGS" ])
 
 HAVE_PTHREAD=0
 AS_IF([test "x$ax_pthread_ok" = "xyes"],[HAVE_PTHREAD=1])