diff --git a/configure.ac b/configure.ac
index 0caa104dd..f3e95225a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4648,6 +4648,30 @@ then
     fi
 fi
 
+# sblim-sfcb support
+AC_ARG_ENABLE([sblim-sfcb],
+    [AS_HELP_STRING([--enable-sblim-sfcb],[Enable sblim-sfcb support (default: disabled)])],
+    [ ENABLED_SBLIM_SFCB=$enableval ],
+    [ ENABLED_SBLIM_SFCB=no ]
+    )
+# sblim-sfcb support requires all the features enabled within this conditional.
+if test "$ENABLED_SBLIM_SFCB" = "yes"
+then
+    if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno"
+    then
+        ENABLED_OPENSSLEXTRA="yes"
+        AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS"
+    fi
+
+    if test "x$ENABLED_CERTGEN" = "xno"
+    then
+        ENABLED_CERTGEN="yes"
+        AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN"
+    fi
+
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_SBLIM_SFCB -DWOLFSSL_SIGNER_DER_CERT"
+fi
+
 # libest Support
 AC_ARG_ENABLE([libest],
     [AS_HELP_STRING([--enable-libest],[Enable libest (default: disabled)])],
diff --git a/src/ssl.c b/src/ssl.c
index 386271e81..6178ea557 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -45694,12 +45694,12 @@ void* wolfSSL_SESSION_get_ex_data(const WOLFSSL_SESSION* session, int idx)
 }
 #endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL || FORTRESS */
 
-/* Note: This is a huge section of API's - through wolfSSL_SESSION_print */
-#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || \
-                             defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY) || \
-                             defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_OPENSSH)))
-
-
+/* Note: This is a huge section of API's - through
+ *       wolfSSL_X509_OBJECT_get0_X509_CRL */
+#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && \
+    (defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || \
+    defined(HAVE_LIGHTY) || defined(WOLFSSL_HAPROXY) || \
+    defined(WOLFSSL_OPENSSH) || defined(HAVE_SBLIM_SFCB)))
 int wolfSSL_SESSION_get_ex_new_index(long idx, void* data, void* cb1,
        void* cb2, CRYPTO_free_func* cb3)
 {
@@ -45717,7 +45717,6 @@ int wolfSSL_SESSION_get_ex_new_index(long idx, void* data, void* cb1,
     return WOLFSSL_FAILURE;
 }
 
-
 #ifndef NO_WOLFSSL_STUB
 WOLFSSL_DH *wolfSSL_DH_generate_parameters(int prime_len, int generator,
                            void (*callback) (int, int, void *), void *cb_arg)
@@ -45839,7 +45838,6 @@ WOLFSSL_STACK* wolfSSL_sk_X509_INFO_new_null(void)
     return sk;
 }
 
-
 /* returns value less than 0 on fail to match
  * On a successful match the priority level found is returned
  */
@@ -45871,7 +45869,6 @@ static void wolfSSL_CIPHER_free(WOLFSSL_CIPHER* in)
     (void)in;
 }
 
-
 /* free's all nodes in the stack and there data */
 void wolfSSL_sk_SSL_CIPHER_free(WOLF_STACK_OF(WOLFSSL_CIPHER)* sk)
 {
@@ -45978,7 +45975,6 @@ void wolfSSL_sk_X509_INFO_free(WOLF_STACK_OF(WOLFSSL_X509_INFO) *sk)
     wolfSSL_sk_X509_INFO_pop_free(sk, NULL);
 }
 
-
 /* Adds the WOLFSSL_X509_INFO to the stack "sk". "sk" takes control of "in" and
  * tries to free it when the stack is free'd.
  *
@@ -46020,7 +46016,6 @@ int wolfSSL_sk_X509_INFO_push(WOLF_STACK_OF(WOLFSSL_X509_INFO)* sk,
     return WOLFSSL_SUCCESS;
 }
 
-
 WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_sk_X509_NAME_new(wolf_sk_compare_cb cb)
 {
     WOLFSSL_STACK* sk;
@@ -46036,7 +46031,6 @@ WOLF_STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_sk_X509_NAME_new(wolf_sk_compare_cb cb
     return sk;
 }
 
-
 /* Creates a duplicate of WOLF_STACK_OF(WOLFSSL_X509_NAME).
  * Returns a new WOLF_STACK_OF(WOLFSSL_X509_NAME) or NULL on failure */
 WOLF_STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list(
@@ -46067,7 +46061,6 @@ WOLF_STACK_OF(WOLFSSL_X509_NAME) *wolfSSL_dup_CA_list(
     return copy;
 }
 
-
 int wolfSSL_sk_X509_NAME_push(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk,
     WOLFSSL_X509_NAME* name)
 {
@@ -46125,7 +46118,6 @@ int wolfSSL_sk_X509_NAME_find(const WOLF_STACK_OF(WOLFSSL_X509_NAME) *sk,
     return -1;
 }
 
-
 void* wolfSSL_sk_X509_OBJECT_value(WOLF_STACK_OF(WOLFSSL_X509_OBJECT)* sk, int i)
 {
     WOLFSSL_ENTER("wolfSSL_sk_X509_OBJECT_value");
@@ -46147,7 +46139,6 @@ int wolfSSL_sk_X509_OBJECT_num(const WOLF_STACK_OF(WOLFSSL_X509_OBJECT) *s)
     }
 }
 
-
 int wolfSSL_sk_X509_NAME_set_cmp_func(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk,
     wolf_sk_compare_cb cb)
 {
@@ -46660,7 +46651,9 @@ WOLFSSL_X509_CRL *wolfSSL_X509_OBJECT_get0_X509_CRL(WOLFSSL_X509_OBJECT *obj)
     return NULL;
 }
 
-#endif /* OPENSSL_ALL || (OPENSSL_EXTRA && (HAVE_STUNNEL || WOLFSSL_NGINX || HAVE_LIGHTY)) */
+#endif /* OPENSSL_ALL || (OPENSSL_EXTRA && (HAVE_STUNNEL || WOLFSSL_NGINX ||
+        * HAVE_LIGHTY || WOLFSSL_HAPROXY || WOLFSSL_OPENSSH ||
+        * HAVE_SBLIM_SFCB)) */
 
 
 #if defined(OPENSSL_EXTRA)