wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5445 from douzzer/20220808-fixes

Browse Source 
20220808-fixes (unchecked snprintf() retvals)
This commit is contained in:
JacobBarthelmeh
2022-08-10 10:21:07 -06:00
committed by GitHub
parent eceee6ac95 c07d0fe4b4
commit b46693f8c8
1 changed files with 523 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

596
src/x509.c
View File

@ -1169,9 +1169,10 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
ASN1_OBJECT* obj; ASN1_OBJECT* obj;
ASN1_STRING* str; ASN1_STRING* str;
int nid; int nid;
const int sz = CTC_NAME_SIZE*2;
int rc = WOLFSSL_FAILURE; int rc = WOLFSSL_FAILURE;
char tmp[CTC_NAME_SIZE*2 + 1] = {0}; char tmp[CTC_NAME_SIZE*2 + 1];
const int tmpSz = sizeof(tmp);
int tmpLen = 0;
WOLFSSL_ENTER("wolfSSL_X509V3_EXT_print"); WOLFSSL_ENTER("wolfSSL_X509V3_EXT_print");
if ((out == NULL) || (ext == NULL)) { if ((out == NULL) || (ext == NULL)) {
@ -1198,9 +1199,9 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
{ {
char isCa[] = "TRUE"; char isCa[] = "TRUE";
char notCa[] = "FALSE"; char notCa[] = "FALSE";
if (XSNPRINTF(tmp, sz, "%*sCA:%s", indent, "", if ((tmpLen = XSNPRINTF(tmp, tmpSz, "%*sCA:%s", indent, "",
obj->ca ? isCa : notCa) obj->ca ? isCa : notCa))
>= sz) >= tmpSz)
return rc; return rc;
break; break;
} }
@ -1208,8 +1209,8 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
{ {
WOLFSSL_STACK* sk; WOLFSSL_STACK* sk;
char* val; char* val;
int valLen;
int len; int len;
tmp[0] = '\0'; /* Make sure tmp is null-terminated */
sk = ext->ext_sk; sk = ext->ext_sk;
while (sk != NULL) { while (sk != NULL) {
@ -1217,7 +1218,7 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
/* str is GENERAL_NAME for subject alternative name ext */ /* str is GENERAL_NAME for subject alternative name ext */
str = sk->data.gn->d.ia5; str = sk->data.gn->d.ia5;
len = str->length + 2; /* + 2 for NULL char and "," */ len = str->length + 2; /* + 2 for NULL char and "," */
if (len > sz) { if (len > tmpSz) {
WOLFSSL_MSG("len greater than buffer size"); WOLFSSL_MSG("len greater than buffer size");
return rc; return rc;
} }
@ -1229,17 +1230,22 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
return rc; return rc;
} }
if (sk->next) { if (sk->next) {
if (XSNPRINTF(val, len, "%*s%s,", if ((valLen = XSNPRINTF(val, len, "%*s%s,",
indent, "", str->strData) indent, "", str->strData))
>= len) >= len)
return rc; return rc;
} else { } else {
if (XSNPRINTF(val, len, "%*s%s", if ((valLen = XSNPRINTF(val, len, "%*s%s",
indent, "", str->strData) indent, "", str->strData))
>= len) >= len)
return rc; return rc;
} }
XSTRNCAT(tmp, val, len); if (tmpLen + valLen > tmpSz) {
XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return rc;
}
XMEMCPY(tmp + tmpLen, val, valLen);
tmpLen += valLen;
XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER);
} }
sk = sk->next; sk = sk->next;
@ -1251,8 +1257,9 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
{ {
char* asn1str; char* asn1str;
asn1str = wolfSSL_i2s_ASN1_STRING(NULL, str); asn1str = wolfSSL_i2s_ASN1_STRING(NULL, str);
if (XSNPRINTF(tmp, sz, "%*s%s", indent, "", asn1str) if ((tmpLen = XSNPRINTF(
>= sz) tmp, tmpSz, "%*s%s", indent, "", asn1str))
>= tmpSz)
return rc; return rc;
XFREE(asn1str, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(asn1str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
break; break;
@ -1265,12 +1272,13 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
break; break;
default: default:
if (XSNPRINTF(tmp, sz, "%*s%s", indent, "", str->strData) if ((tmpLen = XSNPRINTF(
>= sz) tmp, tmpSz, "%*s%s", indent, "", str->strData))
>= tmpSz)
return rc; return rc;
} }
if (wolfSSL_BIO_write(out, tmp, (int)XSTRLEN(tmp)) == (int)XSTRLEN(tmp)) { if (wolfSSL_BIO_write(out, tmp, tmpLen) == tmpLen) {
rc = WOLFSSL_SUCCESS; rc = WOLFSSL_SUCCESS;
} }
(void) flag; (void) flag;
@ -3013,10 +3021,11 @@ unsigned long wolfSSL_X509_NAME_hash(WOLFSSL_X509_NAME* name)
char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz) char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
{ {
WOLFSSL_X509_NAME_ENTRY* entry; WOLFSSL_X509_NAME_ENTRY* entry;
int nameSz, strSz, count, i; int nameSz, strSz, strLen, count, i;
int totalSz = 0; int totalLen = 0;
char *str; char *str;
char tmpBuf[256]; char tmpBuf[256];
const int tmpBufSz = sizeof(tmpBuf);
char buf[80]; char buf[80];
const char* sn; const char* sn;
WOLFSSL_ENTER("wolfSSL_X509_get_name_oneline"); WOLFSSL_ENTER("wolfSSL_X509_get_name_oneline");
@ -3032,7 +3041,6 @@ char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
} }
#endif #endif
tmpBuf[0] = '\0'; /* Make sure tmpBuf is NULL terminated */
/* Loop through X509 name entries and copy new format to buffer */ /* Loop through X509 name entries and copy new format to buffer */
count = wolfSSL_X509_NAME_entry_count(name); count = wolfSSL_X509_NAME_entry_count(name);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
@ -3062,14 +3070,16 @@ char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
*/ */
if (i != count - 1) { if (i != count - 1) {
strSz = (int)XSTRLEN(sn) + nameSz + 4; strSz = (int)XSTRLEN(sn) + nameSz + 4;
totalSz+= strSz;
str = (char*)XMALLOC(strSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); str = (char*)XMALLOC(strSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (str == NULL) { if (str == NULL) {
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
return NULL; return NULL;
} }
if (XSNPRINTF(str, strSz, "%s=%s, ", sn, buf) >= strSz) { if ((strLen = XSNPRINTF(str, strSz, "%s=%s, ", sn, buf))
>= strSz)
{
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return NULL; return NULL;
} }
} }
@ -3078,39 +3088,45 @@ char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
* Add extra strSz for '=' and '\0' characters in XSNPRINTF. * Add extra strSz for '=' and '\0' characters in XSNPRINTF.
*/ */
strSz = (int)XSTRLEN(sn) + nameSz + 2; strSz = (int)XSTRLEN(sn) + nameSz + 2;
totalSz+= strSz;
str = (char*)XMALLOC(strSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); str = (char*)XMALLOC(strSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (str == NULL) { if (str == NULL) {
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
return NULL; return NULL;
} }
if (XSNPRINTF(str, strSz, "%s=%s", sn, buf) >= strSz) { if ((strLen = XSNPRINTF(str, strSz, "%s=%s", sn, buf)) >= strSz) {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return NULL; return NULL;
} }
} }
/* Copy string to tmpBuf */ /* Copy string to tmpBuf */
XSTRNCAT(tmpBuf, str, strSz); if (totalLen + strLen > tmpBufSz) {
WOLFSSL_MSG("buffer overrun");
XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return NULL;
}
XMEMCPY(tmpBuf + totalLen, str, strLen);
totalLen += strLen;
XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
} }
/* Allocate space based on total string size if no buffer was provided */ /* Allocate space based on total string size if no buffer was provided */
if (!in) { if (!in) {
in = (char*)XMALLOC(totalSz+1, NULL, DYNAMIC_TYPE_OPENSSL); in = (char*)XMALLOC(totalLen+1, NULL, DYNAMIC_TYPE_OPENSSL);
if (in == NULL) { if (in == NULL) {
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
return in; return in;
} }
} }
else { else {
if (totalSz > sz) { if (totalLen + 1 > sz) {
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("buffer overrun");
return NULL; return NULL;
} }
} }
XMEMCPY(in, tmpBuf, totalSz); XMEMCPY(in, tmpBuf, totalLen);
in[totalSz] = '\0'; in[totalLen] = '\0';
return in; return in;
} }
@ -5258,12 +5274,16 @@ static int X509PrintSubjAltName(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
if (ret == WOLFSSL_SUCCESS && x509->subjAltNameSet && if (ret == WOLFSSL_SUCCESS && x509->subjAltNameSet &&
x509->altNames != NULL) { x509->altNames != NULL) {
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int len;
XSNPRINTF(scratch, MAX_WIDTH, "%*s", indent, ""); len = XSNPRINTF(scratch, MAX_WIDTH, "%*s", indent, "");
if (len >= MAX_WIDTH)
ret = WOLFSSL_FAILURE;
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
}
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
entry = x509->altNames; entry = x509->altNames;
while (entry != NULL) { while (entry != NULL) {
@ -5276,17 +5296,29 @@ static int X509PrintSubjAltName(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
} }
if (entry->type == ASN_DNS_TYPE) { if (entry->type == ASN_DNS_TYPE) {
XSNPRINTF(scratch, MAX_WIDTH, "DNS:%s", entry->name); len = XSNPRINTF(scratch, MAX_WIDTH, "DNS:%s", entry->name);
if (len >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE;
break;
}
} }
#if defined(OPENSSL_ALL) || defined(WOLFSSL_IP_ALT_NAME) #if defined(OPENSSL_ALL) || defined(WOLFSSL_IP_ALT_NAME)
else if (entry->type == ASN_IP_TYPE) { else if (entry->type == ASN_IP_TYPE) {
XSNPRINTF(scratch, MAX_WIDTH, "IP Address:%s", len = XSNPRINTF(scratch, MAX_WIDTH, "IP Address:%s",
entry->ipString); entry->ipString);
if (len >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE;
break;
}
} }
#endif /* OPENSSL_ALL || WOLFSSL_IP_ALT_NAME */ #endif /* OPENSSL_ALL || WOLFSSL_IP_ALT_NAME */
else if (entry->type == ASN_RFC822_TYPE) { else if (entry->type == ASN_RFC822_TYPE) {
XSNPRINTF(scratch, MAX_WIDTH, "Email Address:%s", len = XSNPRINTF(scratch, MAX_WIDTH, "Email Address:%s",
entry->name); entry->name);
if (len >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE;
break;
}
} }
else { else {
WOLFSSL_MSG("Bad alt name type."); WOLFSSL_MSG("Bad alt name type.");
@ -5347,12 +5379,16 @@ static int X509PrintKeyUsage(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
if (ret == WOLFSSL_SUCCESS && x509->keyUsageSet && x509->keyUsage != 0) { if (ret == WOLFSSL_SUCCESS && x509->keyUsageSet && x509->keyUsage != 0) {
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int len;
XSNPRINTF(scratch, MAX_WIDTH, "%*s", indent, ""); len = XSNPRINTF(scratch, MAX_WIDTH, "%*s", indent, "");
if (len >= MAX_WIDTH)
ret = WOLFSSL_FAILURE;
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
}
for (; ret == WOLFSSL_SUCCESS && i < sizeof(usages) / sizeof(usages[i]); for (; ret == WOLFSSL_SUCCESS && i < sizeof(usages) / sizeof(usages[i]);
i++) { i++) {
if (x509->keyUsage & usages[i]) { if (x509->keyUsage & usages[i]) {
@ -5406,12 +5442,16 @@ static int X509PrintExtendedKeyUsage(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
if (ret == WOLFSSL_SUCCESS && x509->extKeyUsageCount > 0 if (ret == WOLFSSL_SUCCESS && x509->extKeyUsageCount > 0
&& x509->extKeyUsage != 0) { && x509->extKeyUsage != 0) {
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int len;
XSNPRINTF(scratch, MAX_WIDTH, "%*s", indent, ""); len = XSNPRINTF(scratch, MAX_WIDTH, "%*s", indent, "");
if (len >= MAX_WIDTH)
ret = WOLFSSL_FAILURE;
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
}
for (; ret == WOLFSSL_SUCCESS && i < sizeof(usages) / sizeof(usages[i]); for (; ret == WOLFSSL_SUCCESS && i < sizeof(usages) / sizeof(usages[i]);
i++) { i++) {
if (x509->extKeyUsage & usages[i]) { if (x509->extKeyUsage & usages[i]) {
@ -5444,63 +5484,60 @@ static int X509PrintSerial(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
unsigned char serial[32]; unsigned char serial[32];
int sz = sizeof(serial); int sz = sizeof(serial);
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
const int scratchSz = sizeof(scratch);
int scratchLen;
XMEMSET(serial, 0, sz); XMEMSET(serial, 0, sz);
if (wolfSSL_X509_get_serial_number(x509, serial, &sz) == WOLFSSL_SUCCESS) { if (wolfSSL_X509_get_serial_number(x509, serial, &sz) == WOLFSSL_SUCCESS) {
if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*sSerial Number:",
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", indent, "")) >= MAX_WIDTH) {
"Serial Number:"); WOLFSSL_MSG("buffer overrun");
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (sz > (int)sizeof(byte)) { if (sz > (int)sizeof(byte)) {
int i; int i;
char tmp[100]; int valLen;
int tmpSz = 100;
char val[5];
int valSz = 5;
/* serial is larger than int size so print off hex values */ /* serial is larger than int size so print off hex values */
XSNPRINTF(scratch, MAX_WIDTH, "\n%*s", indent, ""); if ((scratchLen = XSNPRINTF(
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) scratch, MAX_WIDTH, "\n%*s", indent, ""))
<= 0) { >= MAX_WIDTH) {
WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
tmp[0] = '\0'; for (i = 0; i < sz; i++) {
for (i = 0; i < sz - 1 && (3 * i) < tmpSz - valSz; i++) { if ((valLen = XSNPRINTF(
if (XSNPRINTF(val, sizeof(val), "%02x:", serial[i]) scratch + scratchLen, scratchSz - scratchLen,
>= (int)sizeof(val)) "%02x%s", serial[i], (i < sz - 1) ? ":" : "\n"))
>= scratchSz - scratchLen)
{ {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
val[3] = '\0'; /* make sure is null terminated */ scratchLen += valLen;
XSTRNCAT(tmp, val, valSz);
} }
if (XSNPRINTF(val, sizeof(val), "%02x\n", serial[i]) if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
>= (int)sizeof(val)) return WOLFSSL_FAILURE;
}
}
/* if serial can fit into byte then print on the same line */
else {
if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, " %d (0x%x)\n", serial[0], serial[0]))
>= MAX_WIDTH)
{ {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
val[3] = '\0'; /* make sure is null terminated */ if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
XSTRNCAT(tmp, val, valSz);
if (wolfSSL_BIO_write(bio, tmp, (int)XSTRLEN(tmp)) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
/* if serial can fit into byte than print on the same line */
else if (sz <= (int)sizeof(byte)) {
XSNPRINTF(scratch, MAX_WIDTH, " %d (0x%x)\n", serial[0],
serial[0]);
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch))
<= 0) {
return WOLFSSL_FAILURE;
}
}
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
@ -5514,24 +5551,31 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
{ {
int ret = WOLFSSL_SUCCESS; int ret = WOLFSSL_SUCCESS;
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
const int scratchSz = sizeof(scratch);
int scratchLen;
int count, i; int count, i;
char* buf = NULL;
count = wolfSSL_X509_get_ext_count(x509); count = wolfSSL_X509_get_ext_count(x509);
if (count > 0) { if (count <= 0)
char* buf = NULL; return WOLFSSL_SUCCESS;
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
if (x509->isCSR) { if (x509->isCSR) {
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "",
"Requested extensions:"); "Requested extensions:")) >= MAX_WIDTH) {
return WOLFSSL_FAILURE;
}
} }
else else
#endif #endif
{ {
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "",
"X509v3 extensions:"); "X509v3 extensions:")) >= MAX_WIDTH) {
return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { }
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -5541,25 +5585,44 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
for (i = 0; i < count; i++) { for (i = 0; (i < count) && (ret != WOLFSSL_FAILURE); i++) {
WOLFSSL_X509_EXTENSION* ext; WOLFSSL_X509_EXTENSION* ext;
ext = wolfSSL_X509_get_ext(x509, i); ext = wolfSSL_X509_get_ext(x509, i);
if (ext != NULL) { if (ext != NULL) {
WOLFSSL_ASN1_OBJECT* obj; WOLFSSL_ASN1_OBJECT* obj;
int nid; int nid;
char val[5]; char val[6];
int valSz = 5; int valLen;
int len = 0;
word32 j; word32 j;
obj = wolfSSL_X509_EXTENSION_get_object(ext); obj = wolfSSL_X509_EXTENSION_get_object(ext);
wolfSSL_OBJ_obj2txt(buf, MAX_WIDTH, obj, 0); if (obj == NULL) {
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s%s\n", indent + 4, "", ret = WOLFSSL_FAILURE;
break;
}
if (wolfSSL_OBJ_obj2txt(buf, MAX_WIDTH, obj, 0)
== WOLFSSL_FAILURE)
{
ret = WOLFSSL_FAILURE;
break;
}
if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, "%*s%s%s\n", indent + 4, "",
buf, buf,
(wolfSSL_X509_EXTENSION_get_critical(ext))? ": Critical" : ":"); (wolfSSL_X509_EXTENSION_get_critical(ext)
? ": Critical"
: ":")))
>= MAX_WIDTH)
{
ret = WOLFSSL_FAILURE;
break;
}
wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)); if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
ret = WOLFSSL_FAILURE;
break;
}
nid = wolfSSL_OBJ_obj2nid(obj); nid = wolfSSL_OBJ_obj2nid(obj);
switch (nid) { switch (nid) {
case NID_subject_alt_name: case NID_subject_alt_name:
@ -5568,23 +5631,44 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
case NID_subject_key_identifier: case NID_subject_key_identifier:
if (!x509->subjKeyIdSet || x509->subjKeyId == NULL || if (!x509->subjKeyIdSet || x509->subjKeyId == NULL ||
x509->subjKeyIdSz == 0) { x509->subjKeyIdSz == 0)
{
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
XSNPRINTF(scratch, sizeof(scratch) - 1, "%*s", if ((scratchLen = XSNPRINTF(
indent + 8, ""); scratch, scratchSz,
for (j = 0; j < sizeof(scratch) && j < "%*s", indent + 8, "")) >= scratchSz)
(x509->subjKeyIdSz - 1); j++) { {
XSNPRINTF(val, valSz - 1, "%02X:", ret = WOLFSSL_FAILURE;
x509->subjKeyId[j]); break;
XSTRNCAT(scratch, val, valSz);
} }
XSNPRINTF(val, valSz - 1, "%02X\n", x509->subjKeyId[j]); for (j = 0; j < x509->subjKeyIdSz; j++) {
XSTRNCAT(scratch, val, valSz); if ((valLen = XSNPRINTF(
val, sizeof(val), "%02X%s",
x509->subjKeyId[j],
(j < x509->subjKeyIdSz - 1) ? ":" : "\n"))
>= (int)sizeof(val))
{
ret = WOLFSSL_FAILURE;
break;
}
if (scratchLen + valLen >= scratchSz) {
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
(int)XSTRLEN(scratch)) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE;
break;
}
scratchLen = 0;
}
XMEMCPY(scratch + scratchLen, val, valLen);
scratchLen += valLen;
}
if (ret == WOLFSSL_FAILURE)
break;
if (wolfSSL_BIO_write(bio, scratch,
scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
@ -5597,40 +5681,64 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
break; break;
} }
XSNPRINTF(scratch, sizeof(scratch) - 1, "%*s%s", if ((scratchLen = XSNPRINTF(
indent + 8, "", "keyid"); scratch, scratchSz, "%*s%s",
indent + 8, "", "keyid:")) >= scratchSz)
{
ret = WOLFSSL_FAILURE;
break;
}
for (j = 0; j < x509->authKeyIdSz; j++) { for (j = 0; j < x509->authKeyIdSz; j++) {
/* check if buffer is almost full */ if ((valLen = XSNPRINTF(
if (XSTRLEN(scratch) >= sizeof(scratch) - valSz) { val, sizeof(val), "%02X%s",
x509->authKeyId[j],
(j < x509->authKeyIdSz - 1) ? ":" : "\n"))
>= (int)sizeof(val))
{
ret = WOLFSSL_FAILURE;
break;
}
if (scratchLen >= scratchSz - valLen) {
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
(int)XSTRLEN(scratch)) <= 0) { scratchLen) <= 0)
return WOLFSSL_FAILURE; {
ret = WOLFSSL_FAILURE;
break;
} }
scratch[0] = '\0'; scratchLen = 0;
} }
XSNPRINTF(val, valSz - 1, ":%02X", if (scratchLen + valLen >= scratchSz) {
x509->authKeyId[j]); ret = WOLFSSL_FAILURE;
XSTRNCAT(scratch, val, valSz); break;
} }
len = (int)XSTRLEN("\n"); XMEMCPY(scratch + scratchLen, val, valLen);
XSTRNCAT(scratch, "\n", len + 1); scratchLen += valLen;
}
if (ret == WOLFSSL_FAILURE)
break;
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
(int)XSTRLEN(scratch)) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
break; break;
case NID_basic_constraints: case NID_basic_constraints:
if (!x509->basicConstSet) { if (!x509->basicConstSet) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
XSNPRINTF(scratch, sizeof(scratch), "%*sCA:%s\n", if ((scratchLen = XSNPRINTF(
indent + 8, "", (x509->isCa)? "TRUE": "FALSE"); scratch, scratchSz,
"%*sCA:%s\n",
indent + 8, "", (x509->isCa)? "TRUE": "FALSE"))
>= scratchSz)
{
ret = WOLFSSL_FAILURE;
break;
}
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
(int)XSTRLEN(scratch)) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
@ -5646,10 +5754,15 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
default: default:
/* extension nid not yet supported */ /* extension nid not yet supported */
XSNPRINTF(scratch, MAX_WIDTH, if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH,
"%*sNID %d print not yet supported\n", "%*sNID %d print not yet supported\n",
indent + 8, "", nid); indent + 8, "", nid)) >= MAX_WIDTH)
wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)); {
ret = WOLFSSL_FAILURE;
break;
}
ret = wolfSSL_BIO_write(bio, scratch, scratchLen);
} }
} }
} }
@ -5657,7 +5770,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
if (buf != NULL) { if (buf != NULL) {
XFREE(buf, x509->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(buf, x509->heap, DYNAMIC_TYPE_TMP_BUFFER);
} }
}
return ret; return ret;
} }
@ -5669,76 +5782,146 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
static int X509PrintSignature(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent) static int X509PrintSignature(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
{ {
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int scratchLen;
unsigned char* sig = NULL;
int sigSz = 0; int sigSz = 0;
WOLFSSL_ASN1_OBJECT* obj = NULL;
wolfSSL_X509_get_signature(x509, NULL, &sigSz); int ret = WOLFSSL_SUCCESS;
if (sigSz > 0) {
unsigned char* sig;
int i; int i;
char tmp[100]; char tmp[100];
int sigNid = wolfSSL_X509_get_signature_nid(x509); int tmpLen = 0;
WOLFSSL_ASN1_OBJECT* obj; int sigNid;
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", wolfSSL_X509_get_signature(x509, NULL, &sigSz);
"Signature Algorithm: "); if (sigSz <= 0) {
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { return WOLFSSL_SUCCESS;
return WOLFSSL_FAILURE;
} }
sigNid = wolfSSL_X509_get_signature_nid(x509);
if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "",
"Signature Algorithm: ")) >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE;
}
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0)
ret = WOLFSSL_FAILURE;
}
if (ret == WOLFSSL_SUCCESS) {
obj = wolfSSL_OBJ_nid2obj(sigNid); obj = wolfSSL_OBJ_nid2obj(sigNid);
wolfSSL_OBJ_obj2txt(scratch, MAX_WIDTH, obj, 0); if (obj == NULL)
wolfSSL_ASN1_OBJECT_free(obj); ret = WOLFSSL_FAILURE;
XSNPRINTF(tmp, sizeof(tmp) - 1,"%s\n", scratch); }
tmp[sizeof(tmp) - 1] = '\0'; if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, tmp, (int)XSTRLEN(tmp)) <= 0) { if (wolfSSL_OBJ_obj2txt(scratch, MAX_WIDTH, obj, 0)
return WOLFSSL_FAILURE; == WOLFSSL_FAILURE)
{
ret = WOLFSSL_FAILURE;
}
} }
if (ret == WOLFSSL_SUCCESS) {
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp),"%s\n", scratch))
>= (int)sizeof(tmp))
{
ret = WOLFSSL_FAILURE;
}
}
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, tmp, tmpLen) <= 0)
ret = WOLFSSL_FAILURE;
}
if (ret == WOLFSSL_SUCCESS) {
sig = (unsigned char*)XMALLOC(sigSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); sig = (unsigned char*)XMALLOC(sigSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (sig == NULL) { if (sig == NULL)
return WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
if (wolfSSL_X509_get_signature(x509, sig, &sigSz) <= 0) { if (ret == WOLFSSL_SUCCESS) {
XFREE(sig, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (wolfSSL_X509_get_signature(x509, sig, &sigSz) <= 0)
return WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
XSNPRINTF(tmp, sizeof(tmp) - 1, "%*s", indent + 4, "");
tmp[sizeof(tmp) - 1] = '\0'; if (ret == WOLFSSL_SUCCESS) {
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), "%*s", indent + 4, ""))
>= (int)sizeof(tmp))
{
ret = WOLFSSL_FAILURE;
}
}
if (ret == WOLFSSL_SUCCESS) {
for (i = 0; i < sigSz; i++) { for (i = 0; i < sigSz; i++) {
char val[5]; char val[6];
int valSz = 5; int valLen;
if (i == 0) { if (i == 0) {
XSNPRINTF(val, valSz - 1, "%02x", sig[i]); if ((valLen = XSNPRINTF(val, sizeof(val), "%02x", sig[i]))
>= (int)sizeof(val))
{
ret = WOLFSSL_FAILURE;
break;
}
} }
else if (((i % 18) == 0)) { else if (((i % 18) == 0)) {
tmp[sizeof(tmp) - 1] = '\0'; if (wolfSSL_BIO_write(bio, tmp, tmpLen)
if (wolfSSL_BIO_write(bio, tmp, (int)XSTRLEN(tmp))
<= 0) { <= 0) {
XFREE(sig, NULL, DYNAMIC_TYPE_TMP_BUFFER); ret = WOLFSSL_FAILURE;
return WOLFSSL_FAILURE; break;
}
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), ":\n%*s",
indent + 4, ""))
>= (int)sizeof(tmp))
{
ret = WOLFSSL_FAILURE;
break;
}
if ((valLen = XSNPRINTF(val, sizeof(val), "%02x", sig[i]))
>= (int)sizeof(val))
{
ret = WOLFSSL_FAILURE;
break;
} }
XSNPRINTF(tmp, sizeof(tmp) - 1, ":\n%*s", indent + 4, "");
XSNPRINTF(val, valSz - 1, "%02x", sig[i]);
} }
else { else {
XSNPRINTF(val, valSz - 1, ":%02x", sig[i]); if ((valLen = XSNPRINTF(val, sizeof(val), ":%02x", sig[i]))
>= (int)sizeof(val))
{
ret = WOLFSSL_FAILURE;
break;
} }
XSTRNCAT(tmp, val, valSz);
} }
if (valLen >= (int)sizeof(tmp) - tmpLen - 1) {
ret = WOLFSSL_FAILURE;
break;
}
XMEMCPY(tmp + tmpLen, val, valLen);
tmpLen += valLen;
tmp[tmpLen] = 0;
}
}
/* print out remaining sig values */
if (ret == WOLFSSL_SUCCESS) {
if (tmpLen > 0) {
if (wolfSSL_BIO_write(bio, tmp, tmpLen)
<= 0)
{
ret = WOLFSSL_FAILURE;
}
}
}
if (obj != NULL)
wolfSSL_ASN1_OBJECT_free(obj);
if (sig != NULL)
XFREE(sig, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(sig, NULL, DYNAMIC_TYPE_TMP_BUFFER);
/* print out remaining sig values */ return ret;
if ((i > 0) && (((i - 1) % 18) != 0)) {
tmp[sizeof(tmp) - 1] = '\0';
if (wolfSSL_BIO_write(bio, tmp, (int)XSTRLEN(tmp))
<= 0) {
return WOLFSSL_FAILURE;
}
}
}
return WOLFSSL_SUCCESS;
} }
@ -5750,14 +5933,24 @@ static int X509PrintPubKey(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
{ {
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
WOLFSSL_EVP_PKEY* pubKey; WOLFSSL_EVP_PKEY* pubKey;
int len;
int ret = WOLFSSL_SUCCESS;
XSNPRINTF(scratch, MAX_WIDTH, "%*sPublic Key:\n", indent, ""); len = XSNPRINTF(scratch, MAX_WIDTH, "%*sPublic Key:\n", indent, "");
wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)); if (len >= MAX_WIDTH)
return WOLFSSL_FAILURE;
if (wolfSSL_BIO_write(bio, scratch, len) <= 0)
return WOLFSSL_FAILURE;
pubKey = wolfSSL_X509_get_pubkey(x509); pubKey = wolfSSL_X509_get_pubkey(x509);
wolfSSL_EVP_PKEY_print_public(bio, pubKey, indent + 4, NULL); if (pubKey == NULL)
return WOLFSSL_FAILURE;
ret = wolfSSL_EVP_PKEY_print_public(bio, pubKey, indent + 4, NULL);
wolfSSL_EVP_PKEY_free(pubKey); wolfSSL_EVP_PKEY_free(pubKey);
return WOLFSSL_SUCCESS;
return ret;
} }
@ -5769,11 +5962,23 @@ static int X509PrintName(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
char* type, int indent) char* type, int indent)
{ {
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int scratchLen;
if (name != NULL) { if (name != NULL) {
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", type); if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)); "%*s%s", indent, "", type))
wolfSSL_X509_NAME_print_ex(bio, name, 1, 0); >= MAX_WIDTH)
wolfSSL_BIO_write(bio, "\n", (int)XSTRLEN("\n")); {
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE;
}
if (wolfSSL_X509_NAME_print_ex(bio, name, 1, 0) <= 0) {
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, "\n", (int)XSTRLEN("\n")) <= 0) {
return WOLFSSL_FAILURE;
}
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
@ -5787,18 +5992,29 @@ static int _wolfSSL_X509_version_print(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
{ {
int version; int version;
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int scratchLen;
if ((version = wolfSSL_X509_version(x509)) < 0) { if ((version = wolfSSL_X509_version(x509)) < 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", "Version:"); if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { "%*s%s", indent, "", "Version:"))
>= MAX_WIDTH)
{
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
XSNPRINTF(scratch, MAX_WIDTH, " %d (0x%x)\n", version, (byte)version-1); if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { " %d (0x%x)\n", version, (byte)version-1))
>= MAX_WIDTH)
{
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
@ -5814,10 +6030,16 @@ static int X509PrintReqAttributes(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
{ {
WOLFSSL_X509_ATTRIBUTE* attr; WOLFSSL_X509_ATTRIBUTE* attr;
char scratch[MAX_WIDTH]; char scratch[MAX_WIDTH];
int scratchLen;
int i = 0; int i = 0;
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", "Attributes: \n"); if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { "%*s%s", indent, "", "Attributes: \n"))
>= MAX_WIDTH)
{
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
do { do {
@ -5827,7 +6049,11 @@ static int X509PrintReqAttributes(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
int lNameSz = NAME_SZ/4; int lNameSz = NAME_SZ/4;
const byte* data; const byte* data;
wolfSSL_OBJ_obj2txt(lName, lNameSz, attr->object, 0); if (wolfSSL_OBJ_obj2txt(lName, lNameSz, attr->object, 0)
== WOLFSSL_FAILURE)
{
return WOLFSSL_FAILURE;
}
lNameSz = (int)XSTRLEN(lName); lNameSz = (int)XSTRLEN(lName);
data = wolfSSL_ASN1_STRING_get0_data( data = wolfSSL_ASN1_STRING_get0_data(
attr->value->value.asn1_string); attr->value->value.asn1_string);
@ -5835,10 +6061,14 @@ static int X509PrintReqAttributes(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
WOLFSSL_MSG("No REQ attribute found when expected"); WOLFSSL_MSG("No REQ attribute found when expected");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
XSNPRINTF(scratch, MAX_WIDTH, "%*s%s%*s:%s\n", indent+4, "", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
lName, (NAME_SZ/4)-lNameSz, "", data); "%*s%s%*s:%s\n", indent+4, "",
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) lName, (NAME_SZ/4)-lNameSz, "", data))
<= 0) { >= MAX_WIDTH)
{
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
WOLFSSL_MSG("Error writing REQ attribute"); WOLFSSL_MSG("Error writing REQ attribute");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }