wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 11:44:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

address peer review:

Browse Source 
use camel case not underscores in variable names;

restore use of const int variables for buffer sizes in several spots (for ease of smallstack code paths should they be needed);

use more MISRAish flow control in X509PrintSignature().

also, capture the retval from several more snprintf()s to pass directly to wolfSSL_BIO_write(), avoiding frivolous strlen()s.
This commit is contained in:
Daniel Pouzzner
2022-08-09 23:23:11 -05:00
parent 371fbc698c
commit c07d0fe4b4
1 changed files with 170 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

316
src/x509.c
View File

@@ -1169,10 +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]; char tmp[CTC_NAME_SIZE*2 + 1];
int tmp_len = 0; 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)) {
@@ -1199,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 ((tmp_len = XSNPRINTF(tmp, sizeof(tmp), "%*sCA:%s", indent, "", if ((tmpLen = XSNPRINTF(tmp, tmpSz, "%*sCA:%s", indent, "",
obj->ca ? isCa : notCa)) obj->ca ? isCa : notCa))
>= (int)sizeof(tmp)) >= tmpSz)
return rc; return rc;
break; break;
} }
@@ -1209,7 +1209,7 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
{ {
WOLFSSL_STACK* sk; WOLFSSL_STACK* sk;
char* val; char* val;
int val_len; int valLen;
int len; int len;
sk = ext->ext_sk; sk = ext->ext_sk;
@@ -1218,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;
} }
@@ -1230,22 +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 ((val_len = 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 ((val_len = XSNPRINTF(val, len, "%*s%s", if ((valLen = XSNPRINTF(val, len, "%*s%s",
indent, "", str->strData)) indent, "", str->strData))
>= len) >= len)
return rc; return rc;
} }
if (tmp_len + val_len > (int)sizeof(tmp)) { if (tmpLen + valLen > tmpSz) {
XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return rc; return rc;
} }
XMEMCPY(tmp + tmp_len, val, val_len); XMEMCPY(tmp + tmpLen, val, valLen);
tmp_len += val_len; tmpLen += valLen;
XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(val, NULL, DYNAMIC_TYPE_TMP_BUFFER);
} }
sk = sk->next; sk = sk->next;
@@ -1257,9 +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 ((tmp_len = XSNPRINTF( if ((tmpLen = XSNPRINTF(
tmp, sizeof(tmp), "%*s%s", indent, "", asn1str)) tmp, tmpSz, "%*s%s", indent, "", asn1str))
>= (int)sizeof(tmp)) >= tmpSz)
return rc; return rc;
XFREE(asn1str, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(asn1str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
break; break;
@@ -1272,13 +1272,13 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
break; break;
default: default:
if ((tmp_len = XSNPRINTF( if ((tmpLen = XSNPRINTF(
tmp, sizeof(tmp), "%*s%s", indent, "", str->strData)) tmp, tmpSz, "%*s%s", indent, "", str->strData))
>= (int)sizeof(tmp)) >= tmpSz)
return rc; return rc;
} }
if (wolfSSL_BIO_write(out, tmp, tmp_len) == tmp_len) { if (wolfSSL_BIO_write(out, tmp, tmpLen) == tmpLen) {
rc = WOLFSSL_SUCCESS; rc = WOLFSSL_SUCCESS;
} }
(void) flag; (void) flag;
@@ -3021,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, str_len, 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");
@@ -3074,7 +3075,7 @@ char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
return NULL; return NULL;
} }
if ((str_len = XSNPRINTF(str, strSz, "%s=%s, ", sn, buf)) if ((strLen = XSNPRINTF(str, strSz, "%s=%s, ", sn, buf))
>= strSz) >= strSz)
{ {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
@@ -3092,40 +3093,40 @@ char* wolfSSL_X509_get_name_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
return NULL; return NULL;
} }
if ((str_len = 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); XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return NULL; return NULL;
} }
} }
/* Copy string to tmpBuf */ /* Copy string to tmpBuf */
if (totalSz + str_len > (int)sizeof(tmpBuf)) { if (totalLen + strLen > tmpBufSz) {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return NULL; return NULL;
} }
XMEMCPY(tmpBuf + totalSz, str, str_len); XMEMCPY(tmpBuf + totalLen, str, strLen);
totalSz += str_len; 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 + 1 > sz) { if (totalLen + 1 > sz) {
WOLFSSL_MSG("buffer overrun"); 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;
} }
@@ -5483,59 +5484,57 @@ 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];
int scratch_len; 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 ((scratch_len = XSNPRINTF(scratch, MAX_WIDTH, "%*sSerial Number:", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*sSerial Number:",
indent, "")) >= MAX_WIDTH) indent, "")) >= MAX_WIDTH) {
{
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, scratch, scratch_len) <= 0) { 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;
int val_len; int valLen;
/* serial is larger than int size so print off hex values */ /* serial is larger than int size so print off hex values */
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, "\n%*s", indent, "")) scratch, MAX_WIDTH, "\n%*s", indent, ""))
>= MAX_WIDTH) >= MAX_WIDTH) {
{
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
for (i = 0; i < sz; i++) { for (i = 0; i < sz; i++) {
if ((val_len = XSNPRINTF( if ((valLen = XSNPRINTF(
scratch + scratch_len, sizeof(scratch) - scratch_len, scratch + scratchLen, scratchSz - scratchLen,
"%02x%s", serial[i], (i < sz - 1) ? ":" : "\n")) "%02x%s", serial[i], (i < sz - 1) ? ":" : "\n"))
>= (int)sizeof(scratch) - scratch_len) >= scratchSz - scratchLen)
{ {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
scratch_len += val_len; scratchLen += valLen;
} }
if (wolfSSL_BIO_write(bio, scratch, scratch_len) <= 0) { if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
/* if serial can fit into byte then print on the same line */ /* if serial can fit into byte then print on the same line */
else { else {
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, " %d (0x%x)\n", serial[0], serial[0])) scratch, MAX_WIDTH, " %d (0x%x)\n", serial[0], serial[0]))
>= MAX_WIDTH) >= MAX_WIDTH)
{ {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, scratch, scratch_len) if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
<= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
@@ -5552,7 +5551,8 @@ 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];
int scratch_len; const int scratchSz = sizeof(scratch);
int scratchLen;
int count, i; int count, i;
char* buf = NULL; char* buf = NULL;
@@ -5562,7 +5562,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
if (x509->isCSR) { if (x509->isCSR) {
if ((scratch_len = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "",
"Requested extensions:")) >= MAX_WIDTH) { "Requested extensions:")) >= MAX_WIDTH) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -5570,12 +5570,12 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
else else
#endif #endif
{ {
if ((scratch_len = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s\n", indent, "",
"X509v3 extensions:")) >= MAX_WIDTH) { "X509v3 extensions:")) >= MAX_WIDTH) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
if (wolfSSL_BIO_write(bio, scratch, scratch_len) <= 0) { if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -5593,7 +5593,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
WOLFSSL_ASN1_OBJECT* obj; WOLFSSL_ASN1_OBJECT* obj;
int nid; int nid;
char val[6]; char val[6];
int val_len; int valLen;
word32 j; word32 j;
obj = wolfSSL_X509_EXTENSION_get_object(ext); obj = wolfSSL_X509_EXTENSION_get_object(ext);
@@ -5607,7 +5607,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, "%*s%s%s\n", indent + 4, "", scratch, MAX_WIDTH, "%*s%s%s\n", indent + 4, "",
buf, buf,
(wolfSSL_X509_EXTENSION_get_critical(ext) (wolfSSL_X509_EXTENSION_get_critical(ext)
@@ -5619,7 +5619,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
break; break;
} }
if (wolfSSL_BIO_write(bio, scratch, scratch_len) <= 0) { if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
@@ -5637,15 +5637,15 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
break; break;
} }
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, sizeof(scratch), scratch, scratchSz,
"%*s", indent + 8, "")) >= (int)sizeof(scratch)) "%*s", indent + 8, "")) >= scratchSz)
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
for (j = 0; j < x509->subjKeyIdSz; j++) { for (j = 0; j < x509->subjKeyIdSz; j++) {
if ((val_len = XSNPRINTF( if ((valLen = XSNPRINTF(
val, sizeof(val), "%02X%s", val, sizeof(val), "%02X%s",
x509->subjKeyId[j], x509->subjKeyId[j],
(j < x509->subjKeyIdSz - 1) ? ":" : "\n")) (j < x509->subjKeyIdSz - 1) ? ":" : "\n"))
@@ -5654,21 +5654,21 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if (scratch_len + val_len >= (int)sizeof(scratch)) { if (scratchLen + valLen >= scratchSz) {
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
scratch_len) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
scratch_len = 0; scratchLen = 0;
} }
XMEMCPY(scratch + scratch_len, val, val_len); XMEMCPY(scratch + scratchLen, val, valLen);
scratch_len += val_len; scratchLen += valLen;
} }
if (ret == WOLFSSL_FAILURE) if (ret == WOLFSSL_FAILURE)
break; break;
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
scratch_len) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
@@ -5681,15 +5681,15 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
break; break;
} }
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, sizeof(scratch), "%*s%s", scratch, scratchSz, "%*s%s",
indent + 8, "", "keyid:")) >= (int)sizeof(scratch)) indent + 8, "", "keyid:")) >= scratchSz)
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
for (j = 0; j < x509->authKeyIdSz; j++) { for (j = 0; j < x509->authKeyIdSz; j++) {
if ((val_len = XSNPRINTF( if ((valLen = XSNPRINTF(
val, sizeof(val), "%02X%s", val, sizeof(val), "%02X%s",
x509->authKeyId[j], x509->authKeyId[j],
(j < x509->authKeyIdSz - 1) ? ":" : "\n")) (j < x509->authKeyIdSz - 1) ? ":" : "\n"))
@@ -5698,26 +5698,26 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if (scratch_len >= (int)sizeof(scratch) - val_len) { if (scratchLen >= scratchSz - valLen) {
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
scratch_len) <= 0) scratchLen) <= 0)
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
scratch_len = 0; scratchLen = 0;
} }
if (scratch_len + val_len >= (int)sizeof(scratch)) { if (scratchLen + valLen >= scratchSz) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
XMEMCPY(scratch + scratch_len, val, val_len); XMEMCPY(scratch + scratchLen, val, valLen);
scratch_len += val_len; scratchLen += valLen;
} }
if (ret == WOLFSSL_FAILURE) if (ret == WOLFSSL_FAILURE)
break; break;
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
scratch_len) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
@@ -5728,17 +5728,17 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, sizeof(scratch), scratch, scratchSz,
"%*sCA:%s\n", "%*sCA:%s\n",
indent + 8, "", (x509->isCa)? "TRUE": "FALSE")) indent + 8, "", (x509->isCa)? "TRUE": "FALSE"))
>= (int)sizeof(scratch)) >= scratchSz)
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if (wolfSSL_BIO_write(bio, scratch, if (wolfSSL_BIO_write(bio, scratch,
scratch_len) <= 0) { scratchLen) <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
@@ -5754,7 +5754,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
default: default:
/* extension nid not yet supported */ /* extension nid not yet supported */
if ((scratch_len = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, scratch, MAX_WIDTH,
"%*sNID %d print not yet supported\n", "%*sNID %d print not yet supported\n",
indent + 8, "", nid)) >= MAX_WIDTH) indent + 8, "", nid)) >= MAX_WIDTH)
@@ -5762,7 +5762,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
ret = wolfSSL_BIO_write(bio, scratch, scratch_len); ret = wolfSSL_BIO_write(bio, scratch, scratchLen);
} }
} }
} }
@@ -5782,75 +5782,84 @@ 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; unsigned char* sig = NULL;
int sigSz = 0; int sigSz = 0;
WOLFSSL_ASN1_OBJECT* obj = NULL; WOLFSSL_ASN1_OBJECT* obj = NULL;
int ret = WOLFSSL_SUCCESS; int ret = WOLFSSL_SUCCESS;
int i;
char tmp[100];
int tmpLen = 0;
int sigNid;
wolfSSL_X509_get_signature(x509, NULL, &sigSz); wolfSSL_X509_get_signature(x509, NULL, &sigSz);
if (sigSz <= 0) { if (sigSz <= 0) {
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
do { sigNid = wolfSSL_X509_get_signature_nid(x509);
int i;
char tmp[100];
int tmp_len = 0;
int sigNid = wolfSSL_X509_get_signature_nid(x509);
if (XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "",
"Signature Algorithm: ") >= MAX_WIDTH) { "Signature Algorithm: ")) >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE;
}
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; }
}
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) <= 0) { if (ret == WOLFSSL_SUCCESS) {
ret = WOLFSSL_FAILURE;
break;
}
obj = wolfSSL_OBJ_nid2obj(sigNid); obj = wolfSSL_OBJ_nid2obj(sigNid);
if (obj == NULL) { if (obj == NULL)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; }
} if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_OBJ_obj2txt(scratch, MAX_WIDTH, obj, 0) if (wolfSSL_OBJ_obj2txt(scratch, MAX_WIDTH, obj, 0)
== WOLFSSL_FAILURE) == WOLFSSL_FAILURE)
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break;
} }
if ((tmp_len = XSNPRINTF(tmp, sizeof(tmp),"%s\n", scratch)) }
if (ret == WOLFSSL_SUCCESS) {
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp),"%s\n", scratch))
>= (int)sizeof(tmp)) >= (int)sizeof(tmp))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break;
} }
if (wolfSSL_BIO_write(bio, tmp, tmp_len) <= 0) { }
if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, tmp, tmpLen) <= 0)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; }
}
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)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; }
}
if (wolfSSL_X509_get_signature(x509, sig, &sigSz) <= 0) { if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_X509_get_signature(x509, sig, &sigSz) <= 0)
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; }
}
if ((tmp_len = XSNPRINTF(tmp, sizeof(tmp), "%*s", indent + 4, "")) if (ret == WOLFSSL_SUCCESS) {
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), "%*s", indent + 4, ""))
>= (int)sizeof(tmp)) >= (int)sizeof(tmp))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break;
} }
}
if (ret == WOLFSSL_SUCCESS) {
for (i = 0; i < sigSz; i++) { for (i = 0; i < sigSz; i++) {
char val[6]; char val[6];
int val_len; int valLen;
if (i == 0) { if (i == 0) {
if ((val_len = XSNPRINTF(val, sizeof(val), "%02x", sig[i])) if ((valLen = XSNPRINTF(val, sizeof(val), "%02x", sig[i]))
>= (int)sizeof(val)) >= (int)sizeof(val))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
@@ -5858,19 +5867,19 @@ static int X509PrintSignature(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
} }
} }
else if (((i % 18) == 0)) { else if (((i % 18) == 0)) {
if (wolfSSL_BIO_write(bio, tmp, tmp_len) if (wolfSSL_BIO_write(bio, tmp, tmpLen)
<= 0) { <= 0) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if ((tmp_len = XSNPRINTF(tmp, sizeof(tmp), ":\n%*s", if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), ":\n%*s",
indent + 4, "")) indent + 4, ""))
>= (int)sizeof(tmp)) >= (int)sizeof(tmp))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
if ((val_len = XSNPRINTF(val, sizeof(val), "%02x", sig[i])) if ((valLen = XSNPRINTF(val, sizeof(val), "%02x", sig[i]))
>= (int)sizeof(val)) >= (int)sizeof(val))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
@@ -5878,33 +5887,33 @@ static int X509PrintSignature(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
} }
} }
else { else {
if ((val_len = XSNPRINTF(val, sizeof(val), ":%02x", sig[i])) if ((valLen = XSNPRINTF(val, sizeof(val), ":%02x", sig[i]))
>= (int)sizeof(val)) >= (int)sizeof(val))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
} }
if (val_len >= (int)sizeof(tmp) - tmp_len - 1) { if (valLen >= (int)sizeof(tmp) - tmpLen - 1) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
} }
XMEMCPY(tmp + tmp_len, val, val_len); XMEMCPY(tmp + tmpLen, val, valLen);
tmp_len += val_len; tmpLen += valLen;
tmp[tmp_len] = 0; tmp[tmpLen] = 0;
} }
if (ret == WOLFSSL_FAILURE) }
break;
/* print out remaining sig values */ /* print out remaining sig values */
if (tmp_len > 0) { if (ret == WOLFSSL_SUCCESS) {
if (wolfSSL_BIO_write(bio, tmp, tmp_len) if (tmpLen > 0) {
<= 0) { if (wolfSSL_BIO_write(bio, tmp, tmpLen)
ret = WOLFSSL_FAILURE; <= 0)
break; {
} ret = WOLFSSL_FAILURE;
}
} }
} while (0); }
if (obj != NULL) if (obj != NULL)
wolfSSL_ASN1_OBJECT_free(obj); wolfSSL_ASN1_OBJECT_free(obj);
@@ -5953,13 +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) {
if (XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", type) if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
"%*s%s", indent, "", type))
>= MAX_WIDTH) >= MAX_WIDTH)
{
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)); }
wolfSSL_X509_NAME_print_ex(bio, name, 1, 0); if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
wolfSSL_BIO_write(bio, "\n", (int)XSTRLEN("\n")); 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;
} }
@@ -5973,26 +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;
} }
if (XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", "Version:") if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
"%*s%s", indent, "", "Version:"))
>= MAX_WIDTH) >= MAX_WIDTH)
{ {
return WOLFSSL_FAILURE; 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;
} }
if (XSNPRINTF(scratch, MAX_WIDTH, " %d (0x%x)\n", version, (byte)version-1) if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
" %d (0x%x)\n", version, (byte)version-1))
>= MAX_WIDTH) >= MAX_WIDTH)
{ {
return WOLFSSL_FAILURE; 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;
} }
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
@@ -6008,14 +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;
if (XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", "Attributes: \n") if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
"%*s%s", indent, "", "Attributes: \n"))
>= MAX_WIDTH) >= MAX_WIDTH)
{ {
return WOLFSSL_FAILURE; 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;
} }
do { do {
@@ -6037,14 +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;
} }
if (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, "",
lName, (NAME_SZ/4)-lNameSz, "", data))
>= MAX_WIDTH) >= MAX_WIDTH)
{ {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, scratch, (int)XSTRLEN(scratch)) if (wolfSSL_BIO_write(bio, scratch, scratchLen) <= 0) {
<= 0) {
WOLFSSL_MSG("Error writing REQ attribute"); WOLFSSL_MSG("Error writing REQ attribute");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }