wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure certs are identical in tests.

Browse Source
This commit is contained in:
Anthony Hu
2022-12-05 13:57:53 -05:00
parent 57a5c9701d
commit 65a5ea7cae
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/api.c
View File

@ -39512,9 +39512,10 @@ static int test_wolfSSL_i2t_ASN1_OBJECT(void)
static int test_wolfSSL_PEM_write_bio_X509(void) static int test_wolfSSL_PEM_write_bio_X509(void)
{ {
int res = TEST_SKIPPED; int res = TEST_SKIPPED;
#if defined(OPENSSL_EXTRA) && defined(WOLFSSL_AKID_NAME) && \ #if defined(OPENSSL_EXTRA) && defined(OPENSSL_ALL) && \
defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_CERT_GEN) && \ defined(WOLFSSL_AKID_NAME) && defined(WOLFSSL_CERT_EXT) && \
!defined(NO_BIO) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) defined(WOLFSSL_CERT_GEN) && !defined(NO_BIO) && !defined(NO_RSA) && \
!defined(NO_FILESYSTEM)
/* This test contains the hard coded expected /* This test contains the hard coded expected
* lengths. Update if necessary */ * lengths. Update if necessary */
FILE* fp = NULL; FILE* fp = NULL;
@ -39555,12 +39556,13 @@ static int test_wolfSSL_PEM_write_bio_X509(void)
AssertIntEQ(wolfSSL_BIO_get_len(output), expectedLen); AssertIntEQ(wolfSSL_BIO_get_len(output), expectedLen);
/* read exported X509 PEM back into struct, sanity check on export, /* read exported X509 PEM back into struct, sanity check on export,
* make sure notBefore/notAfter are the same. */ * make sure notBefore/notAfter are the same and certs are identical. */
AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL));
AssertNotNull(notBeforeB = X509_get_notBefore(x509b)); AssertNotNull(notBeforeB = X509_get_notBefore(x509b));
AssertNotNull(notAfterB = X509_get_notAfter(x509b)); AssertNotNull(notAfterB = X509_get_notAfter(x509b));
AssertIntEQ(ASN1_TIME_compare(notBeforeA, notBeforeB), 0); AssertIntEQ(ASN1_TIME_compare(notBeforeA, notBeforeB), 0);
AssertIntEQ(ASN1_TIME_compare(notAfterA, notAfterB), 0); AssertIntEQ(ASN1_TIME_compare(notAfterA, notAfterB), 0);
AssertIntEQ(0, wolfSSL_X509_cmp(x509a, x509b));
X509_free(x509b); X509_free(x509b);
/* Reset output buffer */ /* Reset output buffer */
@ -39592,6 +39594,7 @@ static int test_wolfSSL_PEM_write_bio_X509(void)
BIO_free(input); BIO_free(input);
BIO_free(output); BIO_free(output);
X509_free(x509a); X509_free(x509a);
X509_free(x509b);
/* test CA and basicConstSet values are encoded when /* test CA and basicConstSet values are encoded when
* the cert is a CA */ * the cert is a CA */
@ -39601,15 +39604,16 @@ static int test_wolfSSL_PEM_write_bio_X509(void)
/* read PEM into X509 struct */ /* read PEM into X509 struct */
AssertNotNull(PEM_read_bio_X509(input, &x509a, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(input, &x509a, NULL, NULL));
/* write X509 back to PEM BIO */ /* write X509 back to PEM BIO; no need to sign as nothing changed */
AssertNotNull(output = BIO_new(wolfSSL_BIO_s_mem())); AssertNotNull(output = BIO_new(wolfSSL_BIO_s_mem()));
AssertIntEQ(PEM_write_bio_X509(output, x509a), WOLFSSL_SUCCESS); AssertIntEQ(PEM_write_bio_X509(output, x509a), WOLFSSL_SUCCESS);
/* read exported X509 PEM back into struct, ensure isCa and basicConstSet /* read exported X509 PEM back into struct, ensure isCa and basicConstSet
* values are maintained; no need to sign as nothing changed. */ * values are maintained and certs are identical.*/
AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL));
AssertIntEQ(x509b->isCa, 1); AssertIntEQ(x509b->isCa, 1);
AssertIntEQ(x509b->basicConstSet, 1); AssertIntEQ(x509b->basicConstSet, 1);
AssertIntEQ(0, wolfSSL_X509_cmp(x509a, x509b));
X509_free(x509a); X509_free(x509a);
X509_free(x509b); X509_free(x509b);
@ -39624,15 +39628,16 @@ static int test_wolfSSL_PEM_write_bio_X509(void)
/* read PEM into X509 struct */ /* read PEM into X509 struct */
AssertNotNull(PEM_read_bio_X509(input, &x509a, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(input, &x509a, NULL, NULL));
/* write X509 back to PEM BIO */ /* write X509 back to PEM BIO; no need to sign as nothing changed */
AssertNotNull(output = BIO_new(wolfSSL_BIO_s_mem())); AssertNotNull(output = BIO_new(wolfSSL_BIO_s_mem()));
AssertIntEQ(PEM_write_bio_X509(output, x509a), WOLFSSL_SUCCESS); AssertIntEQ(PEM_write_bio_X509(output, x509a), WOLFSSL_SUCCESS);
/* read exported X509 PEM back into struct, ensure isCa and /* read exported X509 PEM back into struct, ensure isCa and
* basicConstSet values are maintained */ * basicConstSet values are maintained and certs are identical */
AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL)); AssertNotNull(PEM_read_bio_X509(output, &x509b, NULL, NULL));
AssertIntEQ(x509b->isCa, 0); AssertIntEQ(x509b->isCa, 0);
AssertIntEQ(x509b->basicConstSet, 1); AssertIntEQ(x509b->basicConstSet, 1);
AssertIntEQ(0, wolfSSL_X509_cmp(x509a, x509b));
wolfSSL_EVP_PKEY_free(priv); wolfSSL_EVP_PKEY_free(priv);
X509_free(x509a); X509_free(x509a);