Skip to content

Add X509_STORE intermediates to the CertManager as chain CAs #11917

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
holtrop-wolfssl wants to merge 2 commits into
base: master
Choose a base branch
from
+215 −7
Open

Add X509_STORE intermediates to the CertManager as chain CAs #11917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c55e1ec
Add X509_STORE intermediates to the CertManager as chain CAs
holtrop-wolfssl Oct 28, 2026
9ecd129
wolfSSL_X509_STORE_add_cert: treat NOT_CA_ERROR as success like openssl
holtrop-wolfssl Oct 29, 2026
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
20 changes: 14 additions & 6 deletions src/x509_str.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,13 +2216,14 @@ WOLFSSL_LOCAL int X509StorePushCertsToCM(WOLFSSL_X509_STORE* store)
if (store == NULL || store->cm == NULL)
return WOLFSSL_SUCCESS;

/* Push non-self-signed intermediates from store->certs into the CM. */
/* Push non-self-signed intermediates from store->certs into the CM. They
* are added as chain CAs so AddCA() enforces CA:TRUE and keyCertSign. */
if (store->certs != NULL) {
num = wolfSSL_sk_X509_num(store->certs);
for (i = 0; i < num; i++) {
x509 = wolfSSL_sk_X509_value(store->certs, i);
if (x509 != NULL) {
ret = X509StoreAddCa(store, x509, WOLFSSL_USER_CA);
ret = X509StoreAddCa(store, x509, WOLFSSL_CHAIN_CA);
if (ret != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("X509StorePushCertsToCM: failed to add cert");
anyFail = 1;
Expand Down Expand Up @@ -2268,8 +2269,8 @@ int wolfSSL_X509_STORE_add_cert(WOLFSSL_X509_STORE* store, WOLFSSL_X509* x509)
if (store != NULL && store->cm != NULL && x509 != NULL
&& x509->derCert != NULL) {
/* Mimic the openssl behavior, must be self signed to be considered
* trusted, addCA() internals will do additional checks for
* CA=TRUE */
* trusted. Other certs are added to the CM as chain CAs, for which
* AddCA() checks CA=TRUE and keyCertSign. */
if (wolfSSL_X509_NAME_cmp(&x509->issuer, &x509->subject) == 0) {
result = X509StoreAddCa(store, x509, WOLFSSL_USER_CA);
if (result == WOLFSSL_SUCCESS && store->trusted != NULL) {
Expand Down Expand Up @@ -2304,9 +2305,16 @@ int wolfSSL_X509_STORE_add_cert(WOLFSSL_X509_STORE* store, WOLFSSL_X509* x509)
}
else {
/* If store->certs is NULL, this is an X509_STORE managed by an
* SSL_CTX, preserve behavior and always add as USER_CA */
* SSL_CTX, add straight to the CM as a chain CA */
result = X509StoreAddCa(
store, x509, WOLFSSL_USER_CA);
store, x509, WOLFSSL_CHAIN_CA);
if (result == WC_NO_ERR_TRACE(NOT_CA_ERROR)) {
/* Like OpenSSL, accept the cert into the store, but it
* cannot act as an issuer, so leave it out of the CM. */
WOLFSSL_MSG("X509_STORE_add_cert: not a CA, not added to "
"CertManager");
result = WOLFSSL_SUCCESS;
}
}
}
}
Expand Down
198 changes: 198 additions & 0 deletions tests/api/test_ossl_x509_str.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4671,3 +4671,201 @@ int test_wolfSSL_CTX_set_cert_store(void)
return EXPECT_RESULT();
}

#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_TLS)
/* Attach a store holding root and inter to a fresh SSL_CTX - either adding
* both before SSL_CTX_set_cert_store() (pushed into the CertManager on attach)
* or after it (added straight to the CertManager) - then verify leaf against
* the CertManager. The verify result is returned via *verifyRet. */
static int ctx_store_verify_leaf(X509* root, X509* inter, X509* leaf,
int addAfterAttach, int* verifyRet)
{
EXPECT_DECLS;
SSL_CTX* ctx = NULL;
X509_STORE* store = NULL;
const unsigned char* der = NULL;
int derSz = 0;

ExpectNotNull(ctx = SSL_CTX_new(TLS_client_method()));
ExpectNotNull(store = X509_STORE_new());
if (!addAfterAttach) {
ExpectIntEQ(X509_STORE_add_cert(store, root), SSL_SUCCESS);
ExpectIntEQ(X509_STORE_add_cert(store, inter), SSL_SUCCESS);
}
if (ctx != NULL && store != NULL) {
SSL_CTX_set_cert_store(ctx, store);
}
else {
X509_STORE_free(store);
store = NULL;
}
if (addAfterAttach) {
ExpectIntEQ(X509_STORE_add_cert(store, root), SSL_SUCCESS);
/* Like OpenSSL, adding a non-CA succeeds (applications such as nginx
* treat a failure as fatal), but it must not become a CA. */
ExpectIntEQ(X509_STORE_add_cert(store, inter), SSL_SUCCESS);
}

ExpectNotNull(der = wolfSSL_X509_get_der(leaf, &derSz));
if (EXPECT_SUCCESS() && verifyRet != NULL) {
*verifyRet = wolfSSL_CertManagerVerifyBuffer(
wolfSSL_CTX_GetCertManager(ctx), der, derSz, WOLFSSL_FILETYPE_ASN1);
}

SSL_CTX_free(ctx);
return EXPECT_RESULT();
}
#endif

/* Regression: certificates added to an X509_STORE that is then attached with
* SSL_CTX_set_cert_store() must not bypass the CA admission checks. A
* CA:FALSE certificate, or a CA:TRUE certificate whose KeyUsage lacks
* keyCertSign, must not become a trust anchor for leaves signed by its key,
* whether it was added before or after the attach. Legitimate intermediates
* must still be usable and, like other chain CAs, unloadable. */
int test_wolfSSL_CTX_set_cert_store_non_ca(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_TLS)
SSL_CTX* ctx = NULL;
X509_STORE* store = NULL;
X509* root = NULL;
X509* inter = NULL;
X509* inter2 = NULL;
X509* leaf = NULL;
int verifyRet;
int addAfterAttach;

/* Sanity: legitimate intermediates pushed on attach anchor the chain, and
* are removed by an intermediate unload. */
ExpectNotNull(root = wolfSSL_X509_load_certificate_file(
"./certs/ca-cert.pem", SSL_FILETYPE_PEM));
ExpectNotNull(inter = wolfSSL_X509_load_certificate_file(
"./certs/intermediate/ca-int-cert.pem", SSL_FILETYPE_PEM));
ExpectNotNull(inter2 = wolfSSL_X509_load_certificate_file(
"./certs/intermediate/ca-int2-cert.pem", SSL_FILETYPE_PEM));
ExpectNotNull(ctx = SSL_CTX_new(TLS_client_method()));
ExpectNotNull(store = X509_STORE_new());
ExpectIntEQ(X509_STORE_add_cert(store, root), SSL_SUCCESS);
ExpectIntEQ(X509_STORE_add_cert(store, inter), SSL_SUCCESS);
ExpectIntEQ(X509_STORE_add_cert(store, inter2), SSL_SUCCESS);
if (ctx != NULL && store != NULL) {
SSL_CTX_set_cert_store(ctx, store);
}
else {
X509_STORE_free(store);
}
store = NULL;
ExpectIntEQ(wolfSSL_CertManagerVerify(wolfSSL_CTX_GetCertManager(ctx),
"./certs/intermediate/server-int-cert.pem", SSL_FILETYPE_PEM),
WOLFSSL_SUCCESS);
X509_free(root);
root = NULL;
X509_free(inter);
inter = NULL;
X509_free(inter2);
inter2 = NULL;

/* CA:FALSE intermediate in the store must not anchor a leaf it signed. */
ExpectNotNull(root = wolfSSL_X509_load_certificate_file(
"./certs/intermediate/ca_false_intermediate/test_ca.pem",
SSL_FILETYPE_PEM));
ExpectNotNull(inter = wolfSSL_X509_load_certificate_file(
"./certs/intermediate/ca_false_intermediate/test_int_not_cacert.pem",
SSL_FILETYPE_PEM));
ExpectNotNull(leaf = wolfSSL_X509_load_certificate_file(
"./certs/intermediate/ca_false_intermediate/test_sign_bynoca_srv.pem",
SSL_FILETYPE_PEM));
for (addAfterAttach = 0; addAfterAttach <= 1; addAfterAttach++) {
verifyRet = WOLFSSL_SUCCESS;
ExpectIntEQ(ctx_store_verify_leaf(root, inter, leaf, addAfterAttach,
&verifyRet), TEST_SUCCESS);
ExpectIntEQ(verifyRet, WC_NO_ERR_TRACE(ASN_NO_SIGNER_E));
}
X509_free(root);
root = NULL;
X509_free(inter);
inter = NULL;
X509_free(leaf);
leaf = NULL;

#if defined(WOLFSSL_CERT_GEN) && defined(WOLFSSL_CERT_EXT) && \
!defined(NO_SHA256) && defined(USE_CERT_BUFFERS_2048) && \
!defined(NO_ASN_TIME) && !defined(ALLOW_INVALID_CERTSIGN)
/* CA:TRUE intermediate without keyCertSign must not anchor a leaf. */
{
WC_RNG rng;
RsaKey caKey, intKey, leafKey;
int rngI = 0, caI = 0, intI = 0, leafI = 0;
word32 idx;
byte* intDer = NULL;
byte* leafDer = NULL;
int intSz = 0, leafSz = 0;
const byte* p;

intDer = (byte*)XMALLOC(FOURK_BUF, NULL, DYNAMIC_TYPE_TMP_BUFFER);
leafDer = (byte*)XMALLOC(FOURK_BUF, NULL, DYNAMIC_TYPE_TMP_BUFFER);
ExpectNotNull(intDer);
ExpectNotNull(leafDer);

ExpectIntEQ(wc_InitRng(&rng), 0);
if (EXPECT_SUCCESS()) rngI = 1;
ExpectIntEQ(wc_InitRsaKey(&caKey, NULL), 0);
if (EXPECT_SUCCESS()) caI = 1;
idx = 0;
ExpectIntEQ(wc_RsaPrivateKeyDecode(ca_key_der_2048, &idx, &caKey,
sizeof_ca_key_der_2048), 0);
ExpectIntEQ(wc_InitRsaKey(&intKey, NULL), 0);
if (EXPECT_SUCCESS()) intI = 1;
idx = 0;
ExpectIntEQ(wc_RsaPrivateKeyDecode(server_key_der_2048, &idx, &intKey,
sizeof_server_key_der_2048), 0);
ExpectIntEQ(wc_InitRsaKey(&leafKey, NULL), 0);
if (EXPECT_SUCCESS()) leafI = 1;
idx = 0;
ExpectIntEQ(wc_RsaPrivateKeyDecode(client_key_der_2048, &idx,
&leafKey, sizeof_client_key_der_2048), 0);

ExpectIntGT((intSz = gen_ca_int_keyusage(intDer, FOURK_BUF, &intKey,
&caKey, &rng, "No keyCertSign Intermediate", "digitalSignature",
0)), 0);
ExpectIntGT((leafSz = gen_leaf_under_int(leafDer, FOURK_BUF,
&leafKey, intDer, intSz, &intKey, &rng, "Leaf under bad int")), 0);

p = ca_cert_der_2048;
ExpectNotNull(root = d2i_X509(NULL, &p, (int)sizeof_ca_cert_der_2048));
p = intDer;
ExpectNotNull(inter = d2i_X509(NULL, &p, intSz));
p = leafDer;
ExpectNotNull(leaf = d2i_X509(NULL, &p, leafSz));
for (addAfterAttach = 0; addAfterAttach <= 1; addAfterAttach++) {
verifyRet = WOLFSSL_SUCCESS;
ExpectIntEQ(ctx_store_verify_leaf(root, inter, leaf,
addAfterAttach, &verifyRet), TEST_SUCCESS);
ExpectIntEQ(verifyRet, WC_NO_ERR_TRACE(ASN_NO_SIGNER_E));
}
X509_free(root);
X509_free(inter);
X509_free(leaf);

if (rngI) wc_FreeRng(&rng);
if (caI) wc_FreeRsaKey(&caKey);
if (intI) wc_FreeRsaKey(&intKey);
if (leafI) wc_FreeRsaKey(&leafKey);
XFREE(intDer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(leafDer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
#endif

/* The pushed legitimate intermediates are chain CAs, not permanent
* anchors: an intermediate unload removes them. */
ExpectIntEQ(wolfSSL_CertManagerUnloadIntermediateCerts(
wolfSSL_CTX_GetCertManager(ctx)), WOLFSSL_SUCCESS);
ExpectIntNE(wolfSSL_CertManagerVerify(wolfSSL_CTX_GetCertManager(ctx),
"./certs/intermediate/server-int-cert.pem", SSL_FILETYPE_PEM),
WOLFSSL_SUCCESS);
SSL_CTX_free(ctx);
#endif
return EXPECT_RESULT();
}
4 changes: 3 additions & 1 deletion tests/api/test_ossl_x509_str.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ int test_wolfSSL_X509_STORE_CTX_set0_crls_handshake(void);
int test_wolfSSL_X509_CA_num(void);
int test_X509_STORE_No_SSL_CTX(void);
int test_wolfSSL_CTX_set_cert_store(void);
int test_wolfSSL_CTX_set_cert_store_non_ca(void);

#define TEST_OSSL_X509_STORE_DECLS \
TEST_DECL_GROUP("ossl_x509_store", test_wolfSSL_X509_STORE_CTX_set_time), \
Expand Down Expand Up @@ -115,6 +116,7 @@ int test_wolfSSL_CTX_set_cert_store(void);
test_wolfSSL_X509_STORE_CTX_set0_crls_handshake), \
TEST_DECL_GROUP("ossl_x509_store", test_wolfSSL_X509_CA_num), \
TEST_DECL_GROUP("ossl_x509_store", test_X509_STORE_No_SSL_CTX), \
TEST_DECL_GROUP("ossl_x509_store", test_wolfSSL_CTX_set_cert_store)
TEST_DECL_GROUP("ossl_x509_store", test_wolfSSL_CTX_set_cert_store), \
TEST_DECL_GROUP("ossl_x509_store", test_wolfSSL_CTX_set_cert_store_non_ca)

#endif /* WOLFCRYPT_TEST_OSSL_X509_STR_H */
Loading