Merge pull request #5262 from miyazakh/qt_unit_failure

This commit is contained in:
Chris Conlon 2022-06-21 16:35:37 -06:00 committed by GitHub
commit 7dbf1a5154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -5526,8 +5526,8 @@ int wolfSSL_X509_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
WOLFSSL_MSG("Error getting x509 signature type");
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_write(bio, " Signature Algorithm: ",
(int)XSTRLEN(" Signature Algorithm: ")) <= 0) {
if (wolfSSL_BIO_write(bio, " Signature Algorithm: ",
(int)XSTRLEN(" Signature Algorithm: ")) <= 0) {
return WOLFSSL_FAILURE;
}
sig = GetSigName(oid);
@ -6089,7 +6089,7 @@ int wolfSSL_X509_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
char tmp[100];
XSNPRINTF(tmp, sizeof(tmp),
" X509v3 Basic Constraints: ");
"\n X509v3 Basic Constraints: ");
if (x509->basicConstCrit) {
XSTRNCAT(tmp, "critical", sizeof(tmp) - XSTRLEN(tmp) - 1);
}
@ -6141,7 +6141,7 @@ int wolfSSL_X509_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
XFREE(sig, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFSSL_FAILURE;
}
XSNPRINTF(tmp, sizeof(tmp) - 1," ");
XSNPRINTF(tmp, sizeof(tmp) - 1," ");
tmp[sizeof(tmp) - 1] = '\0';
for (i = 0; i < sigSz; i++) {
char val[5];
@ -6158,7 +6158,7 @@ int wolfSSL_X509_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
return WOLFSSL_FAILURE;
}
XSNPRINTF(tmp, sizeof(tmp) - 1,
":\n ");
":\n ");
XSNPRINTF(val, valSz - 1, "%02x", sig[i]);
}
else {

View File

@ -51246,9 +51246,9 @@ static void test_wolfSSL_X509_print(void)
#if defined(OPENSSL_ALL) || defined(WOLFSSL_IP_ALT_NAME)
/* Will print IP address subject alt name. */
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3329);
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3341);
#else
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3307);
AssertIntEQ(BIO_get_mem_data(bio, NULL), 3319);
#endif
BIO_free(bio);