Move X509_STORE_CTX_set_flags under OPENSSL_EXTRA

wolfSSL · Oct 21, 2024 · 176bc6a · 176bc6a
1 parent c1234bd
commit 176bc6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/x509_str.c b/src/x509_str.c
@@ -547,6 +547,12 @@ int wolfSSL_X509_STORE_CTX_set_purpose(WOLFSSL_X509_STORE_CTX *ctx,
     WOLFSSL_STUB("wolfSSL_X509_STORE_CTX_set_purpose (not implemented)");
     return 0;
 }
+#endif /* !NO_WOLFSSL_STUB */
+
+#endif /* WOLFSSL_QT || OPENSSL_ALL */
+#endif /* OPENSSL_EXTRA */
+
+#ifdef OPENSSL_EXTRA
 
 void wolfSSL_X509_STORE_CTX_set_flags(WOLFSSL_X509_STORE_CTX *ctx,
         unsigned long flags)
@@ -555,12 +561,6 @@ void wolfSSL_X509_STORE_CTX_set_flags(WOLFSSL_X509_STORE_CTX *ctx,
         ctx->flags |= X509_V_FLAG_PARTIAL_CHAIN;
     }
 }
-#endif /* !NO_WOLFSSL_STUB */
-
-#endif /* WOLFSSL_QT || OPENSSL_ALL */
-#endif /* OPENSSL_EXTRA */
-
-#ifdef OPENSSL_EXTRA
 
 /* set X509_STORE_CTX ex_data, max idx is MAX_EX_DATA. Return WOLFSSL_SUCCESS
  * on success, WOLFSSL_FAILURE on error. */

diff --git a/wolfssl/openssl/x509_vfy.h b/wolfssl/openssl/x509_vfy.h
@@ -33,10 +33,13 @@
 
 #if defined(WOLFSSL_QT) || defined(OPENSSL_ALL)
     WOLFSSL_API int wolfSSL_X509_STORE_CTX_set_purpose(WOLFSSL_X509_STORE_CTX *ctx, int purpose);
+#endif
+#ifdef OPENSSL_EXTRA
     WOLFSSL_API void wolfSSL_X509_STORE_CTX_set_flags(WOLFSSL_X509_STORE_CTX *ctx,
         unsigned long flags);
 #endif
 
+
 #define X509_STORE_CTX_set_purpose  wolfSSL_X509_STORE_CTX_set_purpose
 #define X509_STORE_CTX_set_flags    wolfSSL_X509_STORE_CTX_set_flags