Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 13 additions & 7 deletions tests/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -20548,10 +20548,12 @@ static int test_sk_X509(void)
ExpectNotNull(s = wolfSSL_sk_X509_new(NULL));
ExpectIntEQ(sk_X509_num(s), 0);
sk_X509_pop_free(s, NULL);
s = NULL;

ExpectNotNull(s = sk_X509_new_null());
ExpectIntEQ(sk_X509_num(s), 0);
sk_X509_pop_free(s, NULL);
s = NULL;

ExpectNotNull(s = sk_X509_new_null());

Expand Down Expand Up @@ -21141,7 +21143,7 @@ static int test_wolfSSL_X509_CRL_sign_large(void)
WOLFSSL_X509_CRL* crl = NULL;
WOLFSSL_EVP_PKEY* pkey = NULL;
WOLFSSL_ASN1_TIME asnTime;
WOLFSSL_X509_REVOKED revoked;
WOLFSSL_X509_REVOKED revoked = {0};
XFILE fp = XBADFILE;
int i;
byte serial[4];
Expand All @@ -21166,9 +21168,11 @@ static int test_wolfSSL_X509_CRL_sign_large(void)
ExpectIntEQ(wolfSSL_X509_CRL_set_nextUpdate(crl, &asnTime),
WOLFSSL_SUCCESS);

revoked.serialNumber = wolfSSL_ASN1_INTEGER_new();
revoked.serialNumber->data = serial;
revoked.serialNumber->length = (int)sizeof(serial);
ExpectNotNull(revoked.serialNumber = wolfSSL_ASN1_INTEGER_new());
if (revoked.serialNumber != NULL) {
revoked.serialNumber->data = serial;
revoked.serialNumber->length = (int)sizeof(serial);
}

for (i = 1; i <= 1024; i++) {
serial[0] = (byte)(i & 0xff);
Expand All @@ -21189,9 +21193,11 @@ static int test_wolfSSL_X509_CRL_sign_large(void)
ExpectIntEQ(wolfSSL_X509_CRL_sign(crl, pkey, wolfSSL_EVP_sha256()),
WOLFSSL_SUCCESS);

revoked.serialNumber->data = NULL;
wolfSSL_ASN1_INTEGER_free(revoked.serialNumber);
revoked.serialNumber = NULL;
if (revoked.serialNumber != NULL) {
revoked.serialNumber->data = NULL;
wolfSSL_ASN1_INTEGER_free(revoked.serialNumber);
revoked.serialNumber = NULL;
}

wolfSSL_EVP_PKEY_free(pkey);
wolfSSL_X509_CRL_free(crl);
Expand Down
6 changes: 1 addition & 5 deletions wolfcrypt/src/asn.c
Original file line number Diff line number Diff line change
Expand Up @@ -32270,14 +32270,10 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,
signCtx.key = rsaKey;
signCtx.keyType = RSA_TYPE;
}
else if (eccKey) {
else {
signCtx.key = eccKey;
signCtx.keyType = ECC_TYPE;
}
else {
ret = BAD_FUNC_ARG;
goto exit_ms;
}

/* Use unified callback path */
ret = MakeSignatureCb(certSignCtx, buf, sz, sig, sigSz,
Expand Down