Skip to content

Commit 3fc3a84

Browse files
ColtonWilleydouzzer
authored andcommitted
Move X509_STORE_CTX_set_flags under OPENSSL_EXTRA
1 parent 1ddb2ce commit 3fc3a84

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/x509_str.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,12 @@ int wolfSSL_X509_STORE_CTX_set_purpose(WOLFSSL_X509_STORE_CTX *ctx,
547547
WOLFSSL_STUB("wolfSSL_X509_STORE_CTX_set_purpose (not implemented)");
548548
return 0;
549549
}
550+
#endif /* !NO_WOLFSSL_STUB */
551+
552+
#endif /* WOLFSSL_QT || OPENSSL_ALL */
553+
#endif /* OPENSSL_EXTRA */
554+
555+
#ifdef OPENSSL_EXTRA
550556

551557
void wolfSSL_X509_STORE_CTX_set_flags(WOLFSSL_X509_STORE_CTX *ctx,
552558
unsigned long flags)
@@ -555,12 +561,6 @@ void wolfSSL_X509_STORE_CTX_set_flags(WOLFSSL_X509_STORE_CTX *ctx,
555561
ctx->flags |= X509_V_FLAG_PARTIAL_CHAIN;
556562
}
557563
}
558-
#endif /* !NO_WOLFSSL_STUB */
559-
560-
#endif /* WOLFSSL_QT || OPENSSL_ALL */
561-
#endif /* OPENSSL_EXTRA */
562-
563-
#ifdef OPENSSL_EXTRA
564564

565565
/* set X509_STORE_CTX ex_data, max idx is MAX_EX_DATA. Return WOLFSSL_SUCCESS
566566
* on success, WOLFSSL_FAILURE on error. */

wolfssl/openssl/x509_vfy.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@
3333

3434
#if defined(WOLFSSL_QT) || defined(OPENSSL_ALL)
3535
WOLFSSL_API int wolfSSL_X509_STORE_CTX_set_purpose(WOLFSSL_X509_STORE_CTX *ctx, int purpose);
36+
#endif
37+
#ifdef OPENSSL_EXTRA
3638
WOLFSSL_API void wolfSSL_X509_STORE_CTX_set_flags(WOLFSSL_X509_STORE_CTX *ctx,
3739
unsigned long flags);
3840
#endif
3941

42+
4043
#define X509_STORE_CTX_set_purpose wolfSSL_X509_STORE_CTX_set_purpose
4144
#define X509_STORE_CTX_set_flags wolfSSL_X509_STORE_CTX_set_flags
4245

0 commit comments

Comments
 (0)