wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-30 17:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5526 from miyazakh/qt_jenkins_fix

Browse Source 
Fix qt nightly test failure
This commit is contained in:
JacobBarthelmeh
2022-09-21 09:38:45 -06:00
committed by GitHub
parent a36604079b 001592a8a3
commit 2bf583aa57
3 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/x509.c
View File

@@ -837,7 +837,7 @@ WOLFSSL_X509_EXTENSION* wolfSSL_X509_set_ext(WOLFSSL_X509* x509, int loc)
#endif
return NULL;
}
ext->crit = x509->keyUsageCrit;
ext->crit = x509->extKeyUsageCrit;
break;
case CRL_DIST_OID:
@@ -5338,7 +5338,7 @@ static int X509PrintSubjAltName(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
}
#endif /* OPENSSL_ALL || WOLFSSL_IP_ALT_NAME */
else if (entry->type == ASN_RFC822_TYPE) {
len = XSNPRINTF(scratch, MAX_WIDTH, "Email Address:%s",
len = XSNPRINTF(scratch, MAX_WIDTH, "email:%s",
entry->name);
if (len >= MAX_WIDTH) {
ret = WOLFSSL_FAILURE;
@@ -5526,7 +5526,7 @@ static int X509PrintSerial_ex(WOLFSSL_BIO* bio, byte* serial, int sz,
/* serial is larger than int size so print off hex values */
if ((scratchLen = XSNPRINTF(
scratch, MAX_WIDTH, "%*s", indent, ""))
scratch, MAX_WIDTH, "\n%*s", indent + 4, ""))
>= MAX_WIDTH) {
WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE;
@@ -5644,8 +5644,8 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
scratch, MAX_WIDTH, "%*s%s%s\n", indent + 4, "",
buf,
(wolfSSL_X509_EXTENSION_get_critical(ext)
? ": Critical"
: ":")))
? ": critical"
: ": ")))
>= MAX_WIDTH)
{
ret = WOLFSSL_FAILURE;
@@ -5725,7 +5725,7 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
if ((valLen = XSNPRINTF(
val, sizeof(val), "%02X%s",
x509->authKeyId[j],
(j < x509->authKeyIdSz - 1) ? ":" : "\n"))
(j < x509->authKeyIdSz - 1) ? ":" : "\n\n"))
>= (int)sizeof(val))
{
ret = WOLFSSL_FAILURE;
@@ -6001,17 +6001,46 @@ static int X509PrintPubKey(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
int len;
int ret = WOLFSSL_SUCCESS;
len = XSNPRINTF(scratch, MAX_WIDTH, "%*sPublic Key:\n", indent, "");
if (bio == NULL || x509 == NULL)
return BAD_FUNC_ARG;
len = XSNPRINTF(scratch, MAX_WIDTH, "%*sSubject Public Key Info:\n", indent, "");
if (len >= MAX_WIDTH)
return WOLFSSL_FAILURE;
if (wolfSSL_BIO_write(bio, scratch, len) <= 0)
return WOLFSSL_FAILURE;
switch (x509->pubKeyOID) {
#ifndef NO_RSA
case RSAk:
len = XSNPRINTF(scratch, MAX_WIDTH,
"%*sPublic Key Algorithm: rsaEncryption\n", indent + 4, "");
if (len >= MAX_WIDTH)
return WOLFSSL_FAILURE;
if (wolfSSL_BIO_write(bio, scratch, len) <= 0)
return WOLFSSL_FAILURE;
break;
#endif
#ifdef HAVE_ECC
case ECDSAk:
len = XSNPRINTF(scratch, MAX_WIDTH,
"%*sPublic Key Algorithm: EC\n", indent + 4, "");
if (len >= MAX_WIDTH)
return WOLFSSL_FAILURE;
if (wolfSSL_BIO_write(bio, scratch, len) <= 0)
return WOLFSSL_FAILURE;
break;
#endif
default:
WOLFSSL_MSG("Unknown key type");
return WOLFSSL_FAILURE;
}
pubKey = wolfSSL_X509_get_pubkey(x509);
if (pubKey == NULL)
return WOLFSSL_FAILURE;
ret = wolfSSL_EVP_PKEY_print_public(bio, pubKey, indent + 4, NULL);
ret = wolfSSL_EVP_PKEY_print_public(bio, pubKey, indent + 8, NULL);
wolfSSL_EVP_PKEY_free(pubKey);
@@ -6215,8 +6244,8 @@ int wolfSSL_X509_REQ_print(WOLFSSL_BIO* bio, WOLFSSL_X509* x509)
int wolfSSL_X509_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
unsigned long nmflags, unsigned long cflag)
{
char issuType[] = "Issuer: ";
char subjType[] = "Subject: ";
char issuType[] = "Issuer:";
char subjType[] = "Subject:";
WOLFSSL_ENTER("wolfSSL_X509_print_ex");
@@ -6337,7 +6366,7 @@ int wolfSSL_X509_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
}
/* print out signature */
if (X509PrintSignature(bio, x509, 0, 8) != WOLFSSL_SUCCESS) {
if (X509PrintSignature(bio, x509, 0, 4) != WOLFSSL_SUCCESS) {
return WOLFSSL_FAILURE;
}
@@ -12077,20 +12106,21 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
if (len == 0 || buf == NULL)
return WOLFSSL_FAILURE;
tmpSz = nameStrSz + len + 3; /* + 3 for '=', comma, and '\0' */
tmpSz = nameStrSz + len + 4; /* + 4 for '=', comma space and '\0'*/
tmp = (char*)XMALLOC(tmpSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) {
return WOLFSSL_FAILURE;
}
if (i < count - 1) {
if (XSNPRINTF(tmp, tmpSz, "%s=%s,", buf, nameStr)
if (XSNPRINTF(tmp, tmpSz, "%s=%s, ", buf, nameStr)
>= tmpSz)
{
WOLFSSL_MSG("buffer overrun");
return WOLFSSL_FAILURE;
}
tmpSz = len + nameStrSz + 2; /* 2 for '=', comma */
tmpSz = len + nameStrSz + 3; /* 3 for '=', comma space */
}
else {
if (XSNPRINTF(tmp, tmpSz, "%s=%s", buf, nameStr)
@@ -12100,7 +12130,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
return WOLFSSL_FAILURE;
}
tmpSz = len + nameStrSz + 1; /* 1 for '=' */
if (bio->type != WOLFSSL_BIO_FILE)
if (bio->type != WOLFSSL_BIO_FILE && bio->type != WOLFSSL_BIO_MEMORY)
++tmpSz; /* include the terminating null when not writing to a
* file.
*/