Skip to content

Compat layer: address several X509_V_FLAG values set to 0 #11470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
padelsbach wants to merge 1 commit into
base: master
Choose a base branch
from
+61 −7
Open

Compat layer: address several X509_V_FLAG values set to 0 #11470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions tests/api/test_ossl_x509_vp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,52 @@ int test_wolfSSL_X509_VERIFY_PARAM_set1_host(void)
#endif /* OPENSSL_EXTRA */
return EXPECT_RESULT();
}

/* A verification flag must either take effect or be refused. */
int test_wolfSSL_X509_VERIFY_PARAM_flag_values(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS)
WOLFSSL_X509_VERIFY_PARAM* param = NULL;
static const unsigned long flags[] = {
X509_V_FLAG_X509_STRICT,
X509_V_FLAG_ALLOW_PROXY_CERTS,
X509_V_FLAG_TRUSTED_FIRST,
X509_V_FLAG_USE_CHECK_TIME,
X509_V_FLAG_NO_CHECK_TIME,
X509_V_FLAG_PARTIAL_CHAIN
};
size_t i;
size_t j;

/* a flag worth zero cannot be told apart from no flag at all */
for (i = 0; i < XELEM_CNT(flags); i++) {
ExpectIntNE(flags[i], 0);
for (j = i + 1; j < XELEM_CNT(flags); j++) {
ExpectIntNE(flags[i], flags[j]);
}
}

/* each flag must read back on its own, and only itself */
for (i = 0; i < XELEM_CNT(flags); i++) {
param = NULL;
ExpectNotNull(param = wolfSSL_X509_VERIFY_PARAM_new());
ExpectIntEQ(wolfSSL_X509_VERIFY_PARAM_set_flags(param, flags[i]),
WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_X509_VERIFY_PARAM_get_flags(param), flags[i]);
wolfSSL_X509_VERIFY_PARAM_free(param);
}

/* flags accumulate rather than replace */
param = NULL;
ExpectNotNull(param = wolfSSL_X509_VERIFY_PARAM_new());
ExpectIntEQ(wolfSSL_X509_VERIFY_PARAM_set_flags(param,
X509_V_FLAG_X509_STRICT), WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_X509_VERIFY_PARAM_set_flags(param,
X509_V_FLAG_ALLOW_PROXY_CERTS), WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_X509_VERIFY_PARAM_get_flags(param),
X509_V_FLAG_X509_STRICT | X509_V_FLAG_ALLOW_PROXY_CERTS);
wolfSSL_X509_VERIFY_PARAM_free(param);
#endif
return EXPECT_RESULT();
}
4 changes: 3 additions & 1 deletion tests/api/test_ossl_x509_vp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@
int test_wolfSSL_X509_VERIFY_PARAM(void);
int test_wolfSSL_X509_VERIFY_PARAM_set1_ip(void);
int test_wolfSSL_X509_VERIFY_PARAM_set1_host(void);
int test_wolfSSL_X509_VERIFY_PARAM_flag_values(void);

#define TEST_OSSL_X509_VFY_PARAMS_DECLS \
TEST_DECL_GROUP("ossl_x509_vp", test_wolfSSL_X509_VERIFY_PARAM), \
TEST_DECL_GROUP("ossl_x509_vp", test_wolfSSL_X509_VERIFY_PARAM_set1_ip), \
TEST_DECL_GROUP("ossl_x509_vp", test_wolfSSL_X509_VERIFY_PARAM_set1_host)
TEST_DECL_GROUP("ossl_x509_vp", test_wolfSSL_X509_VERIFY_PARAM_set1_host), \
TEST_DECL_GROUP("ossl_x509_vp", test_wolfSSL_X509_VERIFY_PARAM_flag_values)

#endif /* WOLFCRYPT_TEST_OSSL_X509_VP_H */
2 changes: 1 addition & 1 deletion wolfssl/openssl/ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY;
#define X509_V_FLAG_CRL_CHECK_ALL WOLFSSL_CRL_CHECKALL

#define X509_V_FLAG_PARTIAL_CHAIN WOLFSSL_PARTIAL_CHAIN
#define X509_V_FLAG_TRUSTED_FIRST 0 /* dummy value needed for gRPC port */
#define X509_V_FLAG_TRUSTED_FIRST WOLFSSL_TRUSTED_FIRST

#define X509_V_FLAG_USE_CHECK_TIME WOLFSSL_USE_CHECK_TIME
#define X509_V_FLAG_NO_CHECK_TIME WOLFSSL_NO_CHECK_TIME
Expand Down
4 changes: 2 additions & 2 deletions wolfssl/openssl/x509.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@

#define X509_V_ERR_UNABLE_TO_GET_CRL WOLFSSL_X509_V_ERR_UNABLE_TO_GET_CRL
#define X509_V_ERR_CRL_HAS_EXPIRED WOLFSSL_X509_V_ERR_CRL_HAS_EXPIRED
#define X509_V_FLAG_ALLOW_PROXY_CERTS 0
#define X509_V_FLAG_X509_STRICT 0
#define X509_V_FLAG_ALLOW_PROXY_CERTS WOLFSSL_ALLOW_PROXY_CERTS
#define X509_V_FLAG_X509_STRICT WOLFSSL_X509_STRICT
Comment thread
padelsbach marked this conversation as resolved.

/*
* Not all of these X509_V_ERR values are used in wolfSSL. Some are included to
Expand Down
9 changes: 6 additions & 3 deletions wolfssl/ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,9 +898,12 @@ struct WOLFSSL_X509_STORE {
};

#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
#define WOLFSSL_USE_CHECK_TIME 0x2
#define WOLFSSL_NO_CHECK_TIME 0x200000
#define WOLFSSL_PARTIAL_CHAIN 0x80000
#define WOLFSSL_USE_CHECK_TIME 0x2
#define WOLFSSL_NO_CHECK_TIME 0x200000
#define WOLFSSL_PARTIAL_CHAIN 0x80000
#define WOLFSSL_X509_STRICT 0x20
#define WOLFSSL_ALLOW_PROXY_CERTS 0x40
#define WOLFSSL_TRUSTED_FIRST 0x8000

#define WOLFSSL_VPARAM_DEFAULT 0x1
#define WOLFSSL_VPARAM_OVERWRITE 0x2
Expand Down
Loading