Skip to content

asn: accept CA files in the TRUSTED CERTIFICATE format #11941

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
gasbytes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

asn: accept CA files in the TRUSTED CERTIFICATE format #11941

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
30 changes: 30 additions & 0 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4080,6 +4080,35 @@ static int test_wolfSSL_CTX_load_verify_locations(void)
return EXPECT_RESULT();
}

/* Load a CA stored in OpenSSL's TRUSTED CERTIFICATE format, as some systems
* ship their CA files. The auxiliary trust data after the certificate must
* not make the CA get rejected. */
static int test_wolfSSL_CTX_load_verify_locations_trusted_cert(void)
{
EXPECT_DECLS;
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_TLS) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_RSA) && \
defined(WOLFSSL_PEM_TO_DER)
WOLFSSL_CTX* ctx = NULL;
WOLFSSL_CERT_MANAGER* cm = NULL;
const char* trusted_cert = "./certs/test/ossl-trusted-cert.pem";

ExpectNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
ExpectIntEQ(wolfSSL_CTX_load_verify_locations(ctx, trusted_cert, NULL),
WOLFSSL_SUCCESS);

/* The loaded CA is usable, the self signed certificate verifies
* against it. */
ExpectNotNull(cm = wolfSSL_CTX_GetCertManager(ctx));
ExpectIntEQ(wolfSSL_CertManagerVerify(cm, trusted_cert,
WOLFSSL_FILETYPE_PEM), WOLFSSL_SUCCESS);

wolfSSL_CTX_free(ctx);
#endif

return EXPECT_RESULT();
}

static int test_wolfSSL_CTX_load_system_CA_certs(void)
{
int res = TEST_SKIPPED;
Expand Down Expand Up @@ -46957,6 +46986,7 @@ TEST_CASE testCases[] = {
TEST_DECL(test_wolfSSL_use_RSAPrivateKey_file),
TEST_DECL(test_wolfSSL_CTX_use_PrivateKey),
TEST_DECL(test_wolfSSL_CTX_load_verify_locations),
TEST_DECL(test_wolfSSL_CTX_load_verify_locations_trusted_cert),
/* Large number of memory allocations. */
TEST_DECL(test_wolfSSL_CTX_load_system_CA_certs),
TEST_DECL(test_wolfSSL_CTX_add_extra_chain_cert),
Expand Down
11 changes: 11 additions & 0 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27916,6 +27916,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
DerBuffer* der;
word32 algId = 0;
word32 idx;
int certLen;
#ifdef OPENSSL_EXTRA
char beginBuf[PEM_LINE_LEN + 1]; /* add 1 for null terminator */
char endBuf[PEM_LINE_LEN + 1]; /* add 1 for null terminator */
Expand Down Expand Up @@ -28228,6 +28229,16 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
break;
}

/* A certificate found under the TRUSTED CERTIFICATE label carries
* auxiliary trust data after it. Keep only the certificate, so it parses
* like one loaded from a CERTIFICATE block. */
if ((header == BEGIN_TRUSTED_CERT) && (type != TRUSTED_CERT_TYPE)) {
idx = 0;
if (GetSequence(der->buffer, &idx, &certLen, der->length) >= 0) {
der->length = idx + (word32)certLen;
}
}

if ((header == BEGIN_PRIV_KEY
#ifdef OPENSSL_EXTRA
|| header == beginBuf
Expand Down
Loading