diff --git a/.github/workflows/debian-package-test.yml b/.github/workflows/debian-package-test.yml
index b46a9a08..1f8c81e6 100644
--- a/.github/workflows/debian-package-test.yml
+++ b/.github/workflows/debian-package-test.yml
@@ -33,7 +33,7 @@ jobs:
     - name: wolfssl configure
       working-directory: ./wolfssl
       run: |
-        ./configure --enable-cryptocb --enable-aescfb --enable-aesctr  --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 --enable-cmac \
+        ./configure --enable-aescfb --enable-aesctr  --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 --enable-cmac \
             C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
     - name: wolfssl make and install
       working-directory: ./wolfssl
diff --git a/.github/workflows/nss-cmsutil-test.yml b/.github/workflows/nss-cmsutil-test.yml
index 48481e89..e41fd0f8 100644
--- a/.github/workflows/nss-cmsutil-test.yml
+++ b/.github/workflows/nss-cmsutil-test.yml
@@ -158,7 +158,7 @@ jobs:
         git clone https://github.com/wolfSSL/wolfssl.git --branch ${{ env.WOLFSSL_VERSION }} --depth 1
         cd wolfssl
         ./autogen.sh
-        ./configure --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
+        ./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
         make
 
     - name: Install wolfSSL
diff --git a/.github/workflows/nss-curl-test.yml b/.github/workflows/nss-curl-test.yml
index 2104afb3..9637e371 100644
--- a/.github/workflows/nss-curl-test.yml
+++ b/.github/workflows/nss-curl-test.yml
@@ -166,7 +166,7 @@ jobs:
           git clone https://github.com/wolfSSL/wolfssl.git --branch ${{ env.WOLFSSL_VERSION }} --depth 1
           cd wolfssl
           ./autogen.sh
-          ./configure --enable-all --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --with-eccminsz=192 --with-max-rsa-bits=8192 CFLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DRSA_MIN_SIZE=1024 -DWOLFSSL_PSS_LONG_SALT"
+          ./configure --enable-all --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --with-eccminsz=192 --with-max-rsa-bits=8192 CFLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DRSA_MIN_SIZE=1024 -DWOLFSSL_PSS_LONG_SALT"
           make
 
       - name: Install wolfSSL
diff --git a/.github/workflows/nss-pdfsig-test.yml b/.github/workflows/nss-pdfsig-test.yml
index ba61774c..fdac970a 100644
--- a/.github/workflows/nss-pdfsig-test.yml
+++ b/.github/workflows/nss-pdfsig-test.yml
@@ -178,7 +178,7 @@ jobs:
         git clone https://github.com/wolfSSL/wolfssl.git --branch ${{ env.WOLFSSL_VERSION }} --depth 1
         cd wolfssl
         ./autogen.sh
-        ./configure --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
+        ./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
         make
 
     - name: Install wolfSSL
diff --git a/.github/workflows/nss-pk12util-debian-test.yml b/.github/workflows/nss-pk12util-debian-test.yml
index 59a9aa21..929db124 100644
--- a/.github/workflows/nss-pk12util-debian-test.yml
+++ b/.github/workflows/nss-pk12util-debian-test.yml
@@ -66,7 +66,7 @@ jobs:
 
         # Configure wolfSSL for PKCS#11 compatibility
         ./autogen.sh
-        ./configure --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
+        ./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
 
         # Build Debian package
         make deb
diff --git a/.github/workflows/nss-pk12util-test.yml b/.github/workflows/nss-pk12util-test.yml
index ec9c3f93..890c33e2 100644
--- a/.github/workflows/nss-pk12util-test.yml
+++ b/.github/workflows/nss-pk12util-test.yml
@@ -158,7 +158,7 @@ jobs:
         git clone https://github.com/wolfSSL/wolfssl.git --branch ${{ env.WOLFSSL_VERSION }} --depth 1
         cd wolfssl
         ./autogen.sh
-        ./configure --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
+        ./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-cmac --enable-aesctr --enable-aesccm --enable-md5 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -D_GNU_SOURCE"
         make
 
     - name: Install wolfSSL
diff --git a/.github/workflows/nss-ssltap-test.yml b/.github/workflows/nss-ssltap-test.yml
index 0b472baa..2c97bd0d 100644
--- a/.github/workflows/nss-ssltap-test.yml
+++ b/.github/workflows/nss-ssltap-test.yml
@@ -175,7 +175,7 @@ jobs:
         git clone https://github.com/wolfSSL/wolfssl.git --branch ${{ env.WOLFSSL_VERSION }} --depth 1
         cd wolfssl
         ./autogen.sh
-        ./configure --enable-all --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --with-eccminsz=192 --with-max-rsa-bits=8192 CFLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DRSA_MIN_SIZE=1024 -DWOLFSSL_PSS_LONG_SALT"
+        ./configure --enable-all --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --with-eccminsz=192 --with-max-rsa-bits=8192 CFLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DRSA_MIN_SIZE=1024 -DWOLFSSL_PSS_LONG_SALT"
         make
 
     - name: Install wolfSSL
diff --git a/.github/workflows/nss.yml b/.github/workflows/nss.yml
index 614bac4b..3c2726f2 100644
--- a/.github/workflows/nss.yml
+++ b/.github/workflows/nss.yml
@@ -131,7 +131,7 @@ jobs:
         ref: ${{ env.WOLFSSL_VERSION }}
         path: wolfssl
         configure: >-
-          --enable-all --enable-aescfb --enable-cryptocb --enable-rsapss
+          --enable-all --enable-aescfb --enable-rsapss
           --enable-keygen --enable-pwdbased --enable-scrypt --with-eccminsz=192
           --with-max-rsa-bits=8192 --enable-rsapss
           CFLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DRSA_MIN_SIZE=1024 -DWOLFSSL_PSS_LONG_SALT"
diff --git a/.github/workflows/storage-upgrade-test.yml b/.github/workflows/storage-upgrade-test.yml
index 3f13702c..b5257908 100644
--- a/.github/workflows/storage-upgrade-test.yml
+++ b/.github/workflows/storage-upgrade-test.yml
@@ -58,7 +58,7 @@ jobs:
       working-directory: ./wolfssl
       run: |
         ./autogen.sh
-        ./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt \
+        ./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt \
             C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT"
         make
 
diff --git a/.github/workflows/wolfssl-v5.6.6-build-workflow.yml b/.github/workflows/wolfssl-v5.6.6-build-workflow.yml
index c1843dad..35f6cd1a 100644
--- a/.github/workflows/wolfssl-v5.6.6-build-workflow.yml
+++ b/.github/workflows/wolfssl-v5.6.6-build-workflow.yml
@@ -55,7 +55,7 @@ jobs:
       if: steps.cache-wolfssl.outputs.cache-hit != 'true'
       working-directory: ./wolfssl
       run: |
-        ./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt \
+        ./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt \
             C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
     - name: wolfssl make install
       if: steps.cache-wolfssl.outputs.cache-hit != 'true'
diff --git a/Docker/firefox/Dockerfile b/Docker/firefox/Dockerfile
index efd05622..cb3d0493 100644
--- a/Docker/firefox/Dockerfile
+++ b/Docker/firefox/Dockerfile
@@ -66,7 +66,7 @@ RUN python3 bootstrap.py --no-interactive --application-choice browser
 RUN git clone --depth 1 --branch $WOLFSSL_TAG https://github.com/wolfssl/wolfssl.git
 WORKDIR /wolfssl
 RUN autoreconf -if
-RUN ./configure --enable-all --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen \
+RUN ./configure --enable-all --enable-aescfb --enable-rsapss --enable-keygen \
     --enable-pwdbased --enable-scrypt 'CFLAGS=-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT'
 RUN make && make install
 WORKDIR /
diff --git a/README.md b/README.md
index 39de4a66..cd3bc6a6 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Build wolfSSL:
 git clone https://github.com/wolfSSL/wolfssl.git
 cd wolfssl
 ./autogen.sh
-./configure --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
+./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
 make
 make check
 sudo make install
diff --git a/wolfpkcs11/internal.h b/wolfpkcs11/internal.h
index a4790e84..81347f06 100644
--- a/wolfpkcs11/internal.h
+++ b/wolfpkcs11/internal.h
@@ -62,7 +62,7 @@ extern "C" {
 
 #if !defined(WOLFSSL_PUBLIC_MP)
 #error Please build wolfSSL using recommended options: \
-./configure --enable-aescfb --enable-cryptocb --enable-rsapss --enable-keygen \
+./configure --enable-aescfb --enable-rsapss --enable-keygen \
 --enable-pwdbased --enable-scrypt \
 C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT"
 #endif