WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5300 from douzzer/20220629-multi-test-fixes 

20220629-multi-test-fixes
pull/5312/head
Sean Parkinson 2022-07-01 16:22:05 +10:00 committed by GitHub
parent 402a4dafd4 2bdcbcc8be
commit b9a8f18a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 92 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/pk.c
View File

@ -151,11 +151,17 @@ static int wolfssl_print_indent(WOLFSSL_BIO* bio, char* line, int lineLen,
if (indent > 0) {
/* Print indent spaces. */
lineLen = (int)XSNPRINTF(line, lineLen - 1, "%*s", indent, " ");
/* Write indents string to BIO */
if (wolfSSL_BIO_write(bio, line, lineLen) <= 0) {
int len_wanted = XSNPRINTF(line, lineLen, "%*s", indent, " ");
if (len_wanted >= lineLen) {
WOLFSSL_MSG("Buffer overflow formatting indentation");
ret = 0;
}
else {
/* Write indents string to BIO */
if (wolfSSL_BIO_write(bio, line, len_wanted) <= 0) {
ret = 0;
}
}
}
return ret;
@ -193,11 +199,16 @@ static int wolfssl_print_value(WOLFSSL_BIO* bio, mp_int* value,
/* Get 32-bits of value. */
v = (word32)value->dp[0];
/* Print the line to the string. */
len = (int)XSNPRINTF(line, sizeof(line) - 1, "%s %u (0x%x)\n", name, v,
len = (int)XSNPRINTF(line, sizeof(line), "%s %u (0x%x)\n", name, v,
v);
/* Write string to BIO */
if (wolfSSL_BIO_write(bio, line, len) <= 0) {
if (len >= (int)sizeof(line)) {
WOLFSSL_MSG("Buffer overflow while formatting value");
ret = 0;
} else {
/* Write string to BIO */
if (wolfSSL_BIO_write(bio, line, len) <= 0) {
ret = 0;
}
}
}
@ -247,10 +258,16 @@ static int wolfssl_print_number(WOLFSSL_BIO* bio, mp_int* num, const char* name,
}
if (ret == 1) {
/* Print header string line to string. */
li = XSNPRINTF(line, sizeof(line) - 1, "%s\n", name);
if (wolfSSL_BIO_write(bio, line, li) <= 0) {
li = XSNPRINTF(line, sizeof(line), "%s\n", name);
if (li >= (int)sizeof(line)) {
WOLFSSL_MSG("Buffer overflow formatting name");
ret = 0;
}
else {
if (wolfSSL_BIO_write(bio, line, li) <= 0) {
ret = 0;
}
}
}
if (ret == 1) {
/* Print any indent spaces. */
@ -259,15 +276,26 @@ static int wolfssl_print_number(WOLFSSL_BIO* bio, mp_int* num, const char* name,
if (ret == 1) {
/* Start first digit line with spaces.
* Writing out zeros ensures number is a positive value. */
li = XSNPRINTF(line, sizeof(line) - 1, PRINT_NUM_INDENT "%s",
li = XSNPRINTF(line, sizeof(line), PRINT_NUM_INDENT "%s",
mp_leading_bit(num) ? "00:" : "");
if (li >= (int)sizeof(line)) {
WOLFSSL_MSG("Buffer overflow formatting spaces");
ret = 0;
}
}
/* Put out each line of numbers. */
for (i = 0; (ret == 1) && (i < rawLen); i++) {
/* Check for a complete line. */
if (li >= PRINT_NUM_MAX_DIGIT_LINE) {
/* More bytes coming so append carriage return. */
/* Encode another byte as 2 hex digits and append colon. */
int len_wanted = XSNPRINTF(line + li, sizeof(line) - li, "%02x:",
rawKey[i]);
/* Check if there was room -- if not, print the current line, not
* including the newest octet.
*/
if (len_wanted >= (int)sizeof(line) - li) {
/* bump current octet to the next line. */
--i;
/* More bytes coming so add a line break. */
line[li++] = '\n';
/* Write out the line. */
if (wolfSSL_BIO_write(bio, line, li) <= 0) {
@ -281,8 +309,9 @@ static int wolfssl_print_number(WOLFSSL_BIO* bio, mp_int* num, const char* name,
XSTRNCPY(line, PRINT_NUM_INDENT, PRINT_NUM_INDENT_CNT + 1);
li = PRINT_NUM_INDENT_CNT;
}
/* Encode another byte as 2 hex digits and append colon. */
li += XSNPRINTF(line + li, sizeof(line) - 1 - li, "%02x:", rawKey[i]);
else {
li += len_wanted;
}
}
if (ret == 1) {
@ -1892,11 +1921,17 @@ int wolfSSL_RSA_print(WOLFSSL_BIO* bio, WOLFSSL_RSA* rsa, int indent)
}
if (ret == 1) {
/* Print header line. */
len = XSNPRINTF(line, sizeof(line) - 1, "\nRSA %s: (%d bit)\n",
len = XSNPRINTF(line, sizeof(line), "\nRSA %s: (%d bit)\n",
(!mp_iszero(&key->d)) ? "Private-Key" : "Public-Key", sz);
if (wolfSSL_BIO_write(bio, line, len) <= 0) {
if (len >= (int)sizeof(line)) {
WOLFSSL_MSG("Buffer overflow while formatting key preamble");
ret = 0;
}
else {
if (wolfSSL_BIO_write(bio, line, len) <= 0) {
ret = 0;
}
}
}
for (i = 0; (ret == 1) && (i < RSA_INTS); i++) {

2
src/tls13.c
View File

@ -1963,7 +1963,7 @@ static int EncryptTls13(WOLFSSL* ssl, byte* output, const byte* input,
if (ret != CRYPTOCB_UNAVAILABLE) {
if (ret > 0) {
ret = 0; /* tsip_Tls13AesEncrypt returns output size */
}
}
return ret;
}
ret = 0;

41
src/x509.c
View File

@ -6231,6 +6231,10 @@ int wolfSSL_X509_print_fp(XFILE fp, WOLFSSL_X509 *x509)
int wolfSSL_X509_signature_print(WOLFSSL_BIO *bp,
const WOLFSSL_X509_ALGOR *sigalg, const WOLFSSL_ASN1_STRING *sig)
{
int length = 0;
word32 idx = 0;
int i;
(void)sig;
WOLFSSL_ENTER("wolfSSL_X509_signature_print");
@ -6240,16 +6244,39 @@ int wolfSSL_X509_signature_print(WOLFSSL_BIO *bp,
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_puts(bp, " Signature Algorithm: ") <= 0) {
if ((sigalg->algorithm->obj == NULL) ||
(sigalg->algorithm->obj[idx] != ASN_OBJECT_ID)) {
WOLFSSL_MSG("Bad ASN1 Object");
return WOLFSSL_FAILURE;
}
idx++; /* skip object id */
if (GetLength((const byte*)sigalg->algorithm->obj, &idx, &length,
sigalg->algorithm->objSz) < 0 || length < 0) {
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_puts(bp, " Raw Signature Algorithm:") <= 0) {
WOLFSSL_MSG("wolfSSL_BIO_puts error");
return WOLFSSL_FAILURE;
}
if (wolfSSL_i2a_ASN1_OBJECT(bp, sigalg->algorithm) <= 0) {
WOLFSSL_MSG("wolfSSL_i2a_ASN1_OBJECT error");
return WOLFSSL_FAILURE;
for (i = 0; i < length; ++i) {
char hex_digits[4];
#ifdef XSNPRINTF
XSNPRINTF(hex_digits, sizeof(hex_digits), "%c%02X", i>0 ? ':' : ' ',
(unsigned int)sigalg->algorithm->obj[idx+i]);
#else
XSPRINTF(hex_digits, "%c%02X", i>0 ? ':' : ' ',
(unsigned int)sigalg->algorithm->obj[idx+i]);
#endif
if (wolfSSL_BIO_puts(bp, hex_digits) <= 0)
return WOLFSSL_FAILURE;
}
if (wolfSSL_BIO_puts(bp, "\n") <= 0)
return WOLFSSL_FAILURE;
return WOLFSSL_SUCCESS;
}
#endif /* !NO_BIO */
@ -11386,7 +11413,11 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
}
else {
XSNPRINTF(tmp, tmpSz, "%s=%s", buf, nameStr);
tmpSz = len + nameStrSz + 2; /* 2 for '=', '\0' */
tmpSz = len + nameStrSz + 1; /* 1 for '=' */
if (bio->type != WOLFSSL_BIO_FILE)
++tmpSz; /* include the terminating null when not writing to a
* file.
*/
}
if (wolfSSL_BIO_write(bio, tmp, tmpSz) != tmpSz) {

8
wolfcrypt/src/siphash.c
View File

@ -886,19 +886,19 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
switch (inSz) {
case 7:
b |= (word64)in[6] << 48;
/* fall-through */
FALL_THROUGH;
case 6:
b |= (word64)in[5] << 40;
/* fall-through */
FALL_THROUGH;
case 5:
b |= (word64)in[4] << 32;
/* fall-through */
FALL_THROUGH;
case 4:
b |= (word64)GET_U32(in);
break;
case 3:
b |= (word64)in[2] << 16;
/* fall-through */
FALL_THROUGH;
case 2:
b |= (word64)GET_U16(in);
break;