feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #7659 from embhorn/zd18179

Browse Source 
Fixes in ASN1 and X509
This commit is contained in:
JacobBarthelmeh
2024-06-20 13:10:40 -06:00
committed by GitHub
parent d545253df7 d4a90e8a71
commit 63f666a599
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ssl_asn1.c
View File

@@ -3510,14 +3510,17 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t,
if (ret != NULL) { if (ret != NULL) {
/* Set the ASN.1 type and length of string. */ /* Set the ASN.1 type and length of string. */
ret->type = V_ASN1_GENERALIZEDTIME; ret->type = V_ASN1_GENERALIZEDTIME;
ret->length = ASN_GENERALIZED_TIME_SIZE;
if (t->type == V_ASN1_GENERALIZEDTIME) { if (t->type == V_ASN1_GENERALIZEDTIME) {
ret->length = ASN_GENERALIZED_TIME_SIZE;
/* Just copy as data already appropriately formatted. */ /* Just copy as data already appropriately formatted. */
XMEMCPY(ret->data, t->data, ASN_GENERALIZED_TIME_SIZE); XMEMCPY(ret->data, t->data, ASN_GENERALIZED_TIME_SIZE);
} }
else { else {
/* Convert UTC TIME to GENERALIZED TIME. */ /* Convert UTC TIME to GENERALIZED TIME. */
ret->length = t->length + 2; /* Add two extra year digits */
if (t->data[0] >= '5') { if (t->data[0] >= '5') {
/* >= 50 is 1900s. */ /* >= 50 is 1900s. */
ret->data[0] = '1'; ret->data[1] = '9'; ret->data[0] = '1'; ret->data[1] = '9';
@@ -3527,7 +3530,7 @@ WOLFSSL_ASN1_TIME* wolfSSL_ASN1_TIME_to_generalizedtime(WOLFSSL_ASN1_TIME *t,
ret->data[0] = '2'; ret->data[1] = '0'; ret->data[0] = '2'; ret->data[1] = '0';
} }
/* Append rest of the data as it is the same. */ /* Append rest of the data as it is the same. */
XMEMCPY(&ret->data[2], t->data, ASN_UTC_TIME_SIZE); XMEMCPY(&ret->data[2], t->data, t->length);
} }
/* Check for pointer to return result through. */ /* Check for pointer to return result through. */

11
src/x509.c
View File

@@ -8236,7 +8236,8 @@ int wolfSSL_X509_CRL_get_signature(WOLFSSL_X509_CRL* crl,
{ {
WOLFSSL_ENTER("wolfSSL_X509_CRL_get_signature"); WOLFSSL_ENTER("wolfSSL_X509_CRL_get_signature");
if (crl == NULL || crl->crlList == NULL || bufSz == NULL) if (crl == NULL || crl->crlList == NULL ||
crl->crlList->signature == NULL || bufSz == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (buf != NULL) if (buf != NULL)
@@ -12972,6 +12973,14 @@ static int get_dn_attr_by_nid(int n, const char** buf)
str = "UID"; str = "UID";
len = 3; len = 3;
break; break;
case NID_serialNumber:
str = "serialNumber";
len = 12;
break;
case NID_title:
str = "title";
len = 5;
break;
default: default:
WOLFSSL_MSG("Attribute type not found"); WOLFSSL_MSG("Attribute type not found");
str = NULL; str = NULL;