Skip to content
Open
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
42 changes: 10 additions & 32 deletions src/crl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2648,27 +2648,25 @@ int wolfSSL_X509_CRL_add_revoked(WOLFSSL_X509_CRL* crl,
}

{
/* The value bytes are the serial number. */
const byte* serial = rev->serialNumber->data;
int serialSz = rev->serialNumber->length;
int i;
int allZero = 1;

if (serial == NULL || serialSz <= 0) {
return BAD_FUNC_ARG;
}

if (serialSz > EXTERNAL_SERIAL_SIZE) {
return BAD_FUNC_ARG;
/* Drop leading zeros so the serial matches a parsed one. */
while ((serialSz > 0) && (serial[0] == 0)) {
serial++;
serialSz--;
}

/* All zero serial numbers are invalid per rfc5280 and not supported */
for (i = 0; i < serialSz; i++) {
if (serial[i] != 0) {
allZero = 0;
break;
}
if (serialSz == 0) {
return BAD_FUNC_ARG;
}
if (allZero) {

if (serialSz > EXTERNAL_SERIAL_SIZE) {
return BAD_FUNC_ARG;
}

Expand Down Expand Up @@ -2765,33 +2763,13 @@ int wolfSSL_X509_CRL_add_revoked_cert(WOLFSSL_X509_CRL* crl,
return ret;
}

serialInt = wolfSSL_ASN1_INTEGER_new();
serialInt = wolfssl_asn1_integer_new_mag(cert->serial, cert->serialSz);
if (serialInt == NULL) {
FreeDecodedCert(cert);
XFREE(cert, NULL, DYNAMIC_TYPE_DCERT);
return MEMORY_E;
}

if (cert->serialSz > WOLFSSL_ASN1_INTEGER_MAX) {
serialInt->data = (unsigned char*)XMALLOC(cert->serialSz, NULL,
DYNAMIC_TYPE_OPENSSL);
if (serialInt->data == NULL) {
wolfSSL_ASN1_INTEGER_free(serialInt);
FreeDecodedCert(cert);
XFREE(cert, NULL, DYNAMIC_TYPE_DCERT);
return MEMORY_E;
}
serialInt->dataMax = (unsigned int)cert->serialSz;
serialInt->isDynamic = 1;
}
else {
serialInt->data = serialInt->intData;
serialInt->dataMax = WOLFSSL_ASN1_INTEGER_MAX;
}

XMEMCPY(serialInt->data, cert->serial, cert->serialSz);
serialInt->length = cert->serialSz;

XMEMSET(&revoked, 0, sizeof(revoked));
revoked.serialNumber = serialInt;
revoked.reason = CRL_REASON_NONE;
Expand Down
35 changes: 3 additions & 32 deletions src/ocsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2160,43 +2160,14 @@ int wolfSSL_OCSP_id_get0_info(WOLFSSL_ASN1_STRING **name,
if (cid->status->serialInt != NULL) {
*serial = cid->status->serialInt;
} else {
int i = 0;
WOLFSSL_ASN1_INTEGER* ser;

ser = wolfSSL_ASN1_INTEGER_new();
/* Same as wolfSSL_X509_get_serialNumber(): positive value. */
ser = wolfssl_asn1_integer_new_mag(cid->status->serial,
cid->status->serialSz);
if (ser == NULL)
return 0;

if (cid->status->serialSz > (WOLFSSL_ASN1_INTEGER_MAX - 2)) {
/* allocate data buffer, +2 for type and length */
ser->data = (unsigned char*)XMALLOC(
(size_t)cid->status->serialSz + 2, NULL,
DYNAMIC_TYPE_OPENSSL);
if (ser->data == NULL) {
wolfSSL_ASN1_INTEGER_free(ser);
return 0;
}
ser->dataMax = (unsigned int)cid->status->serialSz + 2;
ser->isDynamic = 1;
} else {
/* Use array instead of dynamic memory */
ser->data = ser->intData;
ser->dataMax = WOLFSSL_ASN1_INTEGER_MAX;
}

#if defined(WOLFSSL_QT) || defined(WOLFSSL_HAPROXY)
/* Serial number starts at 0 index of ser->data */
XMEMCPY(&ser->data[i], cid->status->serial,
(size_t)cid->status->serialSz);
ser->length = cid->status->serialSz;
#else
ser->data[i++] = ASN_INTEGER;
i += SetLength(cid->status->serialSz, ser->data + i);
XMEMCPY(&ser->data[i], cid->status->serial,
(size_t)cid->status->serialSz);
ser->length = i + cid->status->serialSz;
#endif

cid->status->serialInt = ser;
*serial = ser;
}
Expand Down
Loading
Loading