Skip to content

Fix crash when remote certificate is allocated uninitialized (#473) #502

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

Fix crash when remote certificate is allocated uninitialized (#473) #502

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
5 changes: 4 additions & 1 deletion nx_secure/src/nx_secure_tls_remote_certificate_allocate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,14 @@ UINT status;
tx_mutex_get(&_nx_secure_tls_protection, TX_WAIT_FOREVER);


/* Clear the certificate structure. */
NX_SECURE_MEMSET(certificate, 0, sizeof(NX_SECURE_X509_CERT));

certificate -> nx_secure_x509_certificate_raw_data = raw_certificate_buffer;
certificate -> nx_secure_x509_certificate_raw_buffer_size = buffer_size;

/* This certificate was allocated by the user application and not by TLS. */
certificate->nx_secure_x509_user_allocated_cert = NX_TRUE;
certificate -> nx_secure_x509_user_allocated_cert = NX_TRUE;

/* Add the certificate to the TLS session credentials X509 store. */
status = _nx_secure_x509_store_certificate_add(certificate, &tls_session -> nx_secure_tls_credentials.nx_secure_tls_certificate_store,
Expand Down
8 changes: 8 additions & 0 deletions nx_secure/src/nx_secure_x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,14 @@ UINT status;
return(NX_CRYPTO_PTR_ERROR);
}

/* Initialize optional fields to NULL/0. */
cert -> nx_secure_x509_issuer_identifier = NX_CRYPTO_NULL;
cert -> nx_secure_x509_issuer_identifier_length = 0;
cert -> nx_secure_x509_subject_identifier = NX_CRYPTO_NULL;
cert -> nx_secure_x509_subject_identifier_length = 0;
cert -> nx_secure_x509_extensions_data = NX_CRYPTO_NULL;
cert -> nx_secure_x509_extensions_data_length = 0;

/* Parse a TLV block and get information to continue parsing. */
status = _nx_secure_x509_asn1_tlv_block_parse(buffer, (ULONG *)&length, &tlv_type, &tlv_type_class, &tlv_length, &tlv_data, &header_length);

Expand Down
6 changes: 6 additions & 0 deletions nx_secure/src/nx_secure_x509_extension_find.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ UINT found_extension = NX_CRYPTO_FALSE;
current_buffer = certificate -> nx_secure_x509_extensions_data;
extensions_sequence_length = certificate -> nx_secure_x509_extensions_data_length;

/* Make sure extensions data is present. */
if (current_buffer == NX_CRYPTO_NULL || extensions_sequence_length == 0)
{
return(NX_SECURE_X509_EXTENSION_NOT_FOUND);
}

/* Keep looping until we run out of data to parse. */
while (extensions_sequence_length > 0)
{
Expand Down
37 changes: 37 additions & 0 deletions test/regression/nx_secure_test/nx_secure_x509_parse_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6398,6 +6398,10 @@ TEST(NX_SECURE_X509, X509_version_1_test)
NX_SECURE_X509_CERT certificate;
NX_SECURE_X509_DISTINGUISHED_NAME expected_name;
UINT status;
#ifndef NX_SECURE_X509_DISABLE_KEY_USAGE_CHECK
USHORT key_usage_bitfield = 0;
#endif
UINT bytes_processed;

memset(&certificate, 0, sizeof(certificate));

Expand Down Expand Up @@ -6447,6 +6451,39 @@ UINT status;
EXPECT_EQ(NX_SECURE_TLS_X509_TYPE_RSA_MD5, certificate.nx_secure_x509_signature_algorithm);

EXPECT_EQ(NX_SECURE_X509_VERSION_1, certificate.nx_secure_x509_version);

EXPECT_TRUE(certificate.nx_secure_x509_extensions_data == NX_CRYPTO_NULL);
EXPECT_EQ(0, certificate.nx_secure_x509_extensions_data_length);
EXPECT_TRUE(certificate.nx_secure_x509_issuer_identifier == NX_CRYPTO_NULL);
EXPECT_EQ(0, certificate.nx_secure_x509_issuer_identifier_length);
EXPECT_TRUE(certificate.nx_secure_x509_subject_identifier == NX_CRYPTO_NULL);
EXPECT_EQ(0, certificate.nx_secure_x509_subject_identifier_length);

#ifndef NX_SECURE_X509_DISABLE_KEY_USAGE_CHECK
status = _nx_secure_x509_key_usage_extension_parse(&certificate, &key_usage_bitfield);
EXPECT_EQ(NX_SECURE_X509_EXTENSION_NOT_FOUND, status);
#endif

/* Test that _nx_secure_x509_certificate_parse clears stale optional fields when re-parsing. */
certificate.nx_secure_x509_extensions_data = (const UCHAR *)"stale_extension";
certificate.nx_secure_x509_extensions_data_length = 0x1234;
certificate.nx_secure_x509_issuer_identifier = (const UCHAR *)"stale_issuer";
certificate.nx_secure_x509_issuer_identifier_length = 0x5678;
certificate.nx_secure_x509_subject_identifier = (const UCHAR *)"stale_subject";
certificate.nx_secure_x509_subject_identifier_length = 0x9ABC;

status = _nx_secure_x509_certificate_parse(x509_version_1_ca_cert_der, x509_version_1_ca_cert_der_len, &bytes_processed, &certificate);
EXPECT_EQ(0, status);
EXPECT_TRUE(certificate.nx_secure_x509_extensions_data == NX_CRYPTO_NULL);
EXPECT_EQ(0, certificate.nx_secure_x509_extensions_data_length);
EXPECT_TRUE(certificate.nx_secure_x509_issuer_identifier == NX_CRYPTO_NULL);
EXPECT_EQ(0, certificate.nx_secure_x509_issuer_identifier_length);
EXPECT_TRUE(certificate.nx_secure_x509_subject_identifier == NX_CRYPTO_NULL);
EXPECT_EQ(0, certificate.nx_secure_x509_subject_identifier_length);
#ifndef NX_SECURE_X509_DISABLE_KEY_USAGE_CHECK
status = _nx_secure_x509_key_usage_extension_parse(&certificate, &key_usage_bitfield);
EXPECT_EQ(NX_SECURE_X509_EXTENSION_NOT_FOUND, status);
#endif
}

TEST(NX_SECURE_X509, RSA_parse_test)
Expand Down