lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-05 19:35:48 +03:00
Code Activity

Added back crypto treatment of certs as the keyfile is now passed in and the previous rng issue should no longer be relevent

Browse Source 
Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
This commit is contained in:
Ben Taylor
2025-07-29 13:19:27 +01:00
parent 44703e4cc2
commit 1e2e2ea36d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/suites/test_suite_x509write.function
View File

@@ -130,6 +130,9 @@ void x509_csr_check(char *key_file, char *cert_req_check_file, int md_type,
mbedtls_x509write_csr req; mbedtls_x509write_csr req;
unsigned char buf[4096]; unsigned char buf[4096];
int ret; int ret;
unsigned char check_buf[4000];
FILE *f;
size_t olen = 0;
size_t pem_len = 0, buf_index; size_t pem_len = 0, buf_index;
int der_len = -1; int der_len = -1;
const char *subject_name = "C=NL,O=PolarSSL,CN=PolarSSL Server 1"; const char *subject_name = "C=NL,O=PolarSSL,CN=PolarSSL Server 1";
@@ -209,10 +212,14 @@ void x509_csr_check(char *key_file, char *cert_req_check_file, int md_type,
TEST_ASSERT(buf[buf_index] == 0); TEST_ASSERT(buf[buf_index] == 0);
} }
// When using PSA crypto, RNG isn't controllable, so cert_req_check_file can't be used f = fopen(cert_req_check_file, "r"); //open the file
(void) cert_req_check_file; TEST_ASSERT(f != NULL); //check the file has been opened.
buf[pem_len] = '\0'; olen = fread(check_buf, 1, sizeof(check_buf), f); // read the file
TEST_ASSERT(x509_crt_verifycsr(buf, pem_len + 1) == 0); fclose(f); // close the file
TEST_ASSERT(olen >= pem_len - 1);
TEST_ASSERT(memcmp(buf, check_buf, pem_len - 1) == 0);
der_len = mbedtls_x509write_csr_der(&req, buf, sizeof(buf)); der_len = mbedtls_x509write_csr_der(&req, buf, sizeof(buf));
TEST_ASSERT(der_len >= 0); TEST_ASSERT(der_len >= 0);
@@ -221,10 +228,7 @@ void x509_csr_check(char *key_file, char *cert_req_check_file, int md_type,
goto exit; goto exit;
} }
// When using PSA crypto, RNG isn't controllable, result length isn't der_len -= 1;
// deterministic over multiple runs, removing a single byte isn't enough to
// go into the MBEDTLS_ERR_ASN1_BUF_TOO_SMALL error case
der_len /= 2;
ret = mbedtls_x509write_csr_der(&req, buf, (size_t) (der_len)); ret = mbedtls_x509write_csr_der(&req, buf, (size_t) (der_len));
TEST_ASSERT(ret == MBEDTLS_ERR_ASN1_BUF_TOO_SMALL); TEST_ASSERT(ret == MBEDTLS_ERR_ASN1_BUF_TOO_SMALL);