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

addressed review comments. remove Qt case guard

Browse Source
This commit is contained in:
Hideki Miyazaki
2022-09-16 08:59:50 +09:00
parent a98cda3516
commit a948c78ac7
3 changed files with 18 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/x509.c
View File

@ -837,7 +837,7 @@ WOLFSSL_X509_EXTENSION* wolfSSL_X509_set_ext(WOLFSSL_X509* x509, int loc)
#endif #endif
return NULL; return NULL;
} }
ext->crit = x509->keyUsageCrit; ext->crit = x509->extKeyUsageCrit;
break; break;
case CRL_DIST_OID: case CRL_DIST_OID:
@ -5338,7 +5338,7 @@ static int X509PrintSubjAltName(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
} }
#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) {
len = XSNPRINTF(scratch, MAX_WIDTH, "Email Address:%s", len = XSNPRINTF(scratch, MAX_WIDTH, "email:%s",
entry->name); entry->name);
if (len >= MAX_WIDTH) { if (len >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
@ -5526,12 +5526,7 @@ static int X509PrintSerial_ex(WOLFSSL_BIO* bio, byte* serial, int sz,
/* serial is larger than int size so print off hex values */ /* serial is larger than int size so print off hex values */
if ((scratchLen = XSNPRINTF( if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, scratch, MAX_WIDTH, "\n%*s", indent + 4, ""))
#if defined(WOLFSSL_QT)
"\n%*s", indent + 4, ""))
#else
"%*s", indent, ""))
#endif
>= MAX_WIDTH) { >= MAX_WIDTH) {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
@ -5649,7 +5644,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
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)
? ": Critical" ? ": critical"
: ": "))) : ": ")))
>= MAX_WIDTH) >= MAX_WIDTH)
{ {
@ -5827,7 +5822,6 @@ static int X509PrintSignature_ex(WOLFSSL_BIO* bio, byte* sig,
int i; int i;
char tmp[100]; char tmp[100];
int tmpLen = 0; int tmpLen = 0;
int offset = 4; /* additional indent offset */
if (sigSz <= 0) { if (sigSz <= 0) {
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
@ -5877,11 +5871,8 @@ static int X509PrintSignature_ex(WOLFSSL_BIO* bio, byte* sig,
return ret; return ret;
} }
#if defined(WOLFSSL_QT)
offset = 5;
#endif
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), "%*s", indent + offset, "")) if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), "%*s", indent + 5, ""))
>= (int)sizeof(tmp)) >= (int)sizeof(tmp))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
@ -5908,7 +5899,7 @@ static int X509PrintSignature_ex(WOLFSSL_BIO* bio, byte* sig,
break; break;
} }
if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), ":\n%*s", if ((tmpLen = XSNPRINTF(tmp, sizeof(tmp), ":\n%*s",
indent + offset, "")) indent + 5, ""))
>= (int)sizeof(tmp)) >= (int)sizeof(tmp))
{ {
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
@ -12115,35 +12106,21 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
if (len == 0 || buf == NULL) if (len == 0 || buf == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
tmpSz = nameStrSz + len + tmpSz = nameStrSz + len + 4; /* + 4 for '=', comma space and '\0'*/
#if defined(WOLFSSL_QT)
4; /* + 4 for '=', comma space and '\0'*/
#else
3; /* + 3 for '=', comma, and '\0' */
#endif
tmp = (char*)XMALLOC(tmpSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); tmp = (char*)XMALLOC(tmpSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (i < count - 1) { if (i < count - 1) {
#if defined(WOLFSSL_QT)
if (XSNPRINTF(tmp, tmpSz, "%s=%s, ", buf, nameStr) if (XSNPRINTF(tmp, tmpSz, "%s=%s, ", buf, nameStr)
#else
if (XSNPRINTF(tmp, tmpSz, "%s=%s,", buf, nameStr)
#endif
>= tmpSz) >= tmpSz)
{ {
WOLFSSL_MSG("buffer overrun"); WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
tmpSz = len + nameStrSz + tmpSz = len + nameStrSz + 3; /* 3 for '=', comma space */
#if defined(WOLFSSL_QT)
3; /* 3 for '=', comma space */
#else
2; /* 2 for '=', comma */
#endif
} }
else { else {
if (XSNPRINTF(tmp, tmpSz, "%s=%s", buf, nameStr) if (XSNPRINTF(tmp, tmpSz, "%s=%s", buf, nameStr)
@ -12153,11 +12130,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
tmpSz = len + nameStrSz + 1; /* 1 for '=' */ tmpSz = len + nameStrSz + 1; /* 1 for '=' */
if (bio->type != WOLFSSL_BIO_FILE if (bio->type != WOLFSSL_BIO_FILE && bio->type != WOLFSSL_BIO_MEMORY)
#if defined(WOLFSSL_QT)
&& bio->type != WOLFSSL_BIO_MEMORY
#endif
)
++tmpSz; /* include the terminating null when not writing to a ++tmpSz; /* include the terminating null when not writing to a
* file. * file.
*/ */

50
tests/api.c
View File

@ -3951,7 +3951,7 @@ static int test_wolfSSL_EVP_PKEY_print_public(void)
AssertIntEQ(EVP_PKEY_print_public(wbio, pkey,3,NULL),1); AssertIntEQ(EVP_PKEY_print_public(wbio, pkey,3,NULL),1);
BIO_gets(wbio, line, sizeof(line)); BIO_gets(wbio, line, sizeof(line));
strcpy(line1, " RSA Public-Key: (1024 bit)\n"); strcpy(line1, " Public-Key: (1024 bit)\n");
AssertIntEQ(XSTRNCMP( line, line1, XSTRLEN(line1)), 0); AssertIntEQ(XSTRNCMP( line, line1, XSTRLEN(line1)), 0);
BIO_gets(wbio, line, sizeof(line)); BIO_gets(wbio, line, sizeof(line));
@ -3959,7 +3959,7 @@ static int test_wolfSSL_EVP_PKEY_print_public(void)
AssertIntEQ(XSTRNCMP( line, line1, XSTRLEN(line1)), 0); AssertIntEQ(XSTRNCMP( line, line1, XSTRLEN(line1)), 0);
BIO_gets(wbio, line, sizeof(line)); BIO_gets(wbio, line, sizeof(line));
strcpy(line1, " 00:BC:73:0E:A8:49:F3:74:A2:A9:EF:18:A5:DA:55:\n"); strcpy(line1, " 00:bc:73:0e:a8:49:f3:74:a2:a9:ef:18:a5:da:55:\n");
AssertIntEQ(XSTRNCMP( line, line1, XSTRLEN(line1)), 0); AssertIntEQ(XSTRNCMP( line, line1, XSTRLEN(line1)), 0);
@ -30760,7 +30760,6 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
X509* x509 = NULL; X509* x509 = NULL;
X509_NAME* name = NULL; X509_NAME* name = NULL;
#if defined(WOLFSSL_QT)
const char* expNormal = "C=US, CN=wolfssl.com"; const char* expNormal = "C=US, CN=wolfssl.com";
const char* expReverse = "CN=wolfssl.com, C=US"; const char* expReverse = "CN=wolfssl.com, C=US";
@ -30768,15 +30767,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
const char* expNotEscapedRev = "CN=#wolfssl.com<>;, C= US,+\"\\ "; const char* expNotEscapedRev = "CN=#wolfssl.com<>;, C= US,+\"\\ ";
const char* expRFC5523 = const char* expRFC5523 =
"CN=\\#wolfssl.com\\<\\>\\;, C=\\ US\\,\\+\\\"\\\\\\ "; "CN=\\#wolfssl.com\\<\\>\\;, C=\\ US\\,\\+\\\"\\\\\\ ";
#else
const char* expNormal = "C=US,CN=wolfssl.com";
const char* expReverse = "CN=wolfssl.com,C=US";
const char* expNotEscaped = "C= US,+\"\\ ,CN=#wolfssl.com<>;";
const char* expNotEscapedRev = "CN=#wolfssl.com<>;,C= US,+\"\\ ";
const char* expRFC5523 =
"CN=\\#wolfssl.com\\<\\>\\;,C=\\ US\\,\\+\\\"\\\\\\ ";
#endif
printf(testingFmt, "wolfSSL_X509_NAME_print_ex"); printf(testingFmt, "wolfSSL_X509_NAME_print_ex");
/* Test with real cert (svrCertFile) first */ /* Test with real cert (svrCertFile) first */
@ -30820,11 +30811,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
AssertNotNull(membio = BIO_new(BIO_s_mem())); AssertNotNull(membio = BIO_new(BIO_s_mem()));
AssertIntEQ(X509_NAME_print_ex(membio, name, 0, 0), WOLFSSL_SUCCESS); AssertIntEQ(X509_NAME_print_ex(membio, name, 0, 0), WOLFSSL_SUCCESS);
AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0); AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0);
#if defined(WOLFSSL_QT)
AssertIntEQ(memSz, XSTRLEN(expNormal)); AssertIntEQ(memSz, XSTRLEN(expNormal));
#else
AssertIntEQ(memSz, XSTRLEN(expNormal)+1);
#endif
AssertIntEQ(XSTRNCMP((char*)mem, expNormal, XSTRLEN(expNormal)), 0); AssertIntEQ(XSTRNCMP((char*)mem, expNormal, XSTRLEN(expNormal)), 0);
BIO_free(membio); BIO_free(membio);
@ -30833,11 +30820,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
AssertIntEQ(X509_NAME_print_ex(membio, name, 0, AssertIntEQ(X509_NAME_print_ex(membio, name, 0,
XN_FLAG_RFC2253), WOLFSSL_SUCCESS); XN_FLAG_RFC2253), WOLFSSL_SUCCESS);
AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0); AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0);
#if defined(WOLFSSL_QT)
AssertIntEQ(memSz, XSTRLEN(expReverse)); AssertIntEQ(memSz, XSTRLEN(expReverse));
#else
AssertIntEQ(memSz, XSTRLEN(expReverse)+1);
#endif
BIO_free(membio); BIO_free(membio);
/* Test flags: XN_FLAG_DN_REV - reversed */ /* Test flags: XN_FLAG_DN_REV - reversed */
@ -30845,11 +30828,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
AssertIntEQ(X509_NAME_print_ex(membio, name, 0, AssertIntEQ(X509_NAME_print_ex(membio, name, 0,
XN_FLAG_DN_REV), WOLFSSL_SUCCESS); XN_FLAG_DN_REV), WOLFSSL_SUCCESS);
AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0); AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0);
#if defined(WOLFSSL_QT)
AssertIntEQ(memSz, XSTRLEN(expReverse)); AssertIntEQ(memSz, XSTRLEN(expReverse));
#else
AssertIntEQ(memSz, XSTRLEN(expReverse)+1);
#endif
AssertIntEQ(XSTRNCMP((char*)mem, expReverse, XSTRLEN(expReverse)), 0); AssertIntEQ(XSTRNCMP((char*)mem, expReverse, XSTRLEN(expReverse)), 0);
BIO_free(membio); BIO_free(membio);
@ -30872,11 +30851,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
AssertNotNull(membio = BIO_new(BIO_s_mem())); AssertNotNull(membio = BIO_new(BIO_s_mem()));
AssertIntEQ(X509_NAME_print_ex(membio, name, 0, 0), WOLFSSL_SUCCESS); AssertIntEQ(X509_NAME_print_ex(membio, name, 0, 0), WOLFSSL_SUCCESS);
AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0); AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0);
#if defined(WOLFSSL_QT) AssertIntEQ(memSz, XSTRLEN(expNotEscaped));
AssertIntEQ(memSz, XSTRLEN(expNotEscaped));
#else
AssertIntEQ(memSz, XSTRLEN(expNotEscaped)+1);
#endif
AssertIntEQ(XSTRNCMP((char*)mem, expNotEscaped, AssertIntEQ(XSTRNCMP((char*)mem, expNotEscaped,
XSTRLEN(expNotEscaped)), 0); XSTRLEN(expNotEscaped)), 0);
BIO_free(membio); BIO_free(membio);
@ -30886,11 +30861,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
AssertIntEQ(X509_NAME_print_ex(membio, name, 0, AssertIntEQ(X509_NAME_print_ex(membio, name, 0,
XN_FLAG_RFC2253), WOLFSSL_SUCCESS); XN_FLAG_RFC2253), WOLFSSL_SUCCESS);
AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0); AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0);
#if defined(WOLFSSL_QT)
AssertIntEQ(memSz, XSTRLEN(expRFC5523)); AssertIntEQ(memSz, XSTRLEN(expRFC5523));
#else
AssertIntEQ(memSz, XSTRLEN(expRFC5523)+1);
#endif
AssertIntEQ(XSTRNCMP((char*)mem, expRFC5523, XSTRLEN(expRFC5523)), 0); AssertIntEQ(XSTRNCMP((char*)mem, expRFC5523, XSTRLEN(expRFC5523)), 0);
BIO_free(membio); BIO_free(membio);
@ -30899,11 +30870,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
AssertIntEQ(X509_NAME_print_ex(membio, name, 0, AssertIntEQ(X509_NAME_print_ex(membio, name, 0,
XN_FLAG_DN_REV), WOLFSSL_SUCCESS); XN_FLAG_DN_REV), WOLFSSL_SUCCESS);
AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0); AssertIntGE((memSz = BIO_get_mem_data(membio, &mem)), 0);
#if defined(WOLFSSL_QT)
AssertIntEQ(memSz, XSTRLEN(expNotEscapedRev)); AssertIntEQ(memSz, XSTRLEN(expNotEscapedRev));
#else
AssertIntEQ(memSz, XSTRLEN(expNotEscapedRev)+1);
#endif
AssertIntEQ(XSTRNCMP((char*)mem, expNotEscapedRev, AssertIntEQ(XSTRNCMP((char*)mem, expNotEscapedRev,
XSTRLEN(expNotEscapedRev)), 0); XSTRLEN(expNotEscapedRev)), 0);
BIO_free(membio); BIO_free(membio);
@ -53406,20 +53373,15 @@ static int test_wolfSSL_X509_print(void)
AssertIntEQ(X509_print(bio, x509), SSL_SUCCESS); AssertIntEQ(X509_print(bio, x509), SSL_SUCCESS);
#if defined(OPENSSL_ALL) || defined(WOLFSSL_IP_ALT_NAME) #if defined(OPENSSL_ALL) || defined(WOLFSSL_IP_ALT_NAME)
#if defined(WOLFSSL_QT)
#if defined(WC_DISABLE_RADIX_ZERO_PAD) #if defined(WC_DISABLE_RADIX_ZERO_PAD)
/* Will print IP address subject alt name. */ /* Will print IP address subject alt name. */
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3349); AssertIntEQ(BIO_get_mem_data(bio, NULL), 3345);
#else #else
/* Will print IP address subject alt name. */ /* Will print IP address subject alt name. */
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3350); AssertIntEQ(BIO_get_mem_data(bio, NULL), 3346);
#endif #endif
#else
/* Will print IP address subject alt name. */
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3325);
#endif
#else #else
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3303); AssertIntEQ(BIO_get_mem_data(bio, NULL), 3324);
#endif #endif
BIO_free(bio); BIO_free(bio);

11
wolfcrypt/src/evp.c
View File

@ -9149,7 +9149,7 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz,
idx = 0; idx = 0;
XMEMSET(buff, 0, sizeof(buff)); XMEMSET(buff, 0, sizeof(buff));
Indent(out, indent); Indent(out, indent);
XSTRNCPY(line, "RSA Public-Key: (", sizeof(line)); XSTRNCPY(line, "Public-Key: (", sizeof(line));
if (wolfSSL_BIO_write(out, line, (int)XSTRLEN(line)) <= 0) { if (wolfSSL_BIO_write(out, line, (int)XSTRLEN(line)) <= 0) {
break; break;
} }
@ -9181,13 +9181,8 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz,
nSz++; nSz++;
} }
if (PrintHexWithColon(out, n, nSz, indent + 4, if (PrintHexWithColon(out, n, nSz,
#if defined(WOLFSSL_QT) indent + 4, 1/* lower case */) != WOLFSSL_SUCCESS) {
1/* lower case */
#else
0/* upper case */
#endif
) != WOLFSSL_SUCCESS) {
break; break;
} }
/* print public Exponent */ /* print public Exponent */