From e72948b018bc9d7a1250731440778a3b4c9d32aa Mon Sep 17 00:00:00 2001 From: TakayukiMatsuo Date: Sun, 28 Feb 2021 10:27:43 +0900 Subject: [PATCH] Fix for PR tests --- tests/api.c | 4 +- wolfcrypt/src/evp.c | 116 ++++++++++++++++++++++---------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/tests/api.c b/tests/api.c index 8f52896e7..5bcdc6e06 100644 --- a/tests/api.c +++ b/tests/api.c @@ -2442,7 +2442,7 @@ static void test_wolfSSL_EVP_PKEY_print_public(void) /* skip to the end of modulus element*/ - for( i = 0; i < 7 ;i++) { + for( i = 0; i < 8 ;i++) { BIO_gets(wbio, line, sizeof(line)); } @@ -22603,7 +22603,7 @@ static int test_wc_DhPublicKeyDecode(void) word32 inOutIdx; #if defined(WOLFSSL_DH_EXTRA) && defined(USE_CERT_BUFFERS_2048) - DhKey key; + DhKey key = {0}; printf(testingFmt, "test_wc_DhPublicKeyDecode()"); diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index a91464fa2..3a2b2a45a 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -6950,6 +6950,7 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, int idx = 0; int wsz = 0; word32 i; + word32 exponent = 0; (void)pctx; @@ -7022,16 +7023,16 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("RSA Public-Key: (") - 1; + wsz = sizeof("RSA Public-Key: (") ; XSTRNCPY((char*)(buff + idx), "RSA Public-Key: (", wsz ); - idx += wsz; + idx += wsz -1; wsz = ToDec(bitlen, buff + idx); idx += wsz; - wsz = sizeof(" bit)\n") - 1; + wsz = sizeof(" bit)\n"); XSTRNCPY((char*)(buff + idx), " bit)\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7041,9 +7042,9 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("Modulus:\n") - 1; + wsz = sizeof("Modulus:\n"); XSTRNCPY((char*)(buff + idx), "Modulus:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7055,11 +7056,10 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("Exponent: ") - 1; + wsz = sizeof("Exponent: "); XSTRNCPY((char*)(buff + idx), "Exponent: ", wsz); - idx += wsz; + idx += wsz -1; - word32 exponent = 0; for (i = 0; i < eSz; i++) { exponent <<= 8; exponent += e[i]; @@ -7067,17 +7067,17 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = ToDec(exponent, buff + idx); idx += wsz; - wsz = sizeof(" (0x") - 1; + wsz = sizeof(" (0x"); XSTRNCPY((char*)(buff + idx), " (0x", wsz); - idx += wsz; + idx += wsz -1; for (i = 0; i < eSz; i++) { wsz = ToHex(e[i], buff + idx); idx += wsz; } - wsz = sizeof(")\n") - 1; + wsz = sizeof(")\n"); XSTRNCPY((char*)(buff + idx), ")\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7088,7 +7088,6 @@ static int PrintPubKeyRSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, static int PrintPubKeyEC(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, int indent, int bitlen, ASN1_PCTX* pctx) { - (void)pctx; int res = WOLFSSL_SUCCESS; byte buff[128] = { 0 }; @@ -7102,12 +7101,13 @@ static int PrintPubKeyEC(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, int nid; WOLFSSL_ObjectInfo* oi = NULL; word32 i; - inOutIdx = 0; + int idx = 0; int wsz = 0; + (void)pctx; res = wc_EccPublicKeyDecode_ex(pkey, &inOutIdx, &curveId, - &pointIdx, &pointSz, pkeySz); + &pointIdx, &pointSz, (word32)pkeySz); if (res != 0) return WOLFSSL_FAILURE; @@ -7131,16 +7131,16 @@ static int PrintPubKeyEC(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("Public-Key: (") - 1; + wsz = sizeof("Public-Key: ("); XSTRNCPY((char*)(buff + idx), "Public-Key: (", wsz); - idx += wsz; + idx += wsz -1; wsz = ToDec(bitlen, buff + idx); idx += wsz; - wsz = sizeof(" bit)\n") - 1; + wsz = sizeof(" bit)\n"); XSTRNCPY((char*)(buff + idx), " bit)\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7150,9 +7150,9 @@ static int PrintPubKeyEC(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("pub:\n") - 1; + wsz = sizeof("pub:\n"); XSTRNCPY((char*)(buff + idx), "pub:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7165,17 +7165,17 @@ static int PrintPubKeyEC(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("ASN1 OID: ") - 1; + wsz = sizeof("ASN1 OID: "); XSTRNCPY((char*)(buff + idx), "ASN1 OID: ", wsz); - idx += wsz; + idx += wsz -1; wsz = (int)XSTRLEN(OIDName); - XSTRNCPY((char*)(buff + idx), OIDName, wsz); + XSTRNCPY((char*)(buff + idx), OIDName, wsz +1); idx += wsz; - wsz = sizeof("\n") - 1; + wsz = sizeof("\n"); XSTRNCPY((char*)(buff + idx), "\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7186,17 +7186,17 @@ static int PrintPubKeyEC(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("NIST CURVE: ") - 1; + wsz = sizeof("NIST CURVE: "); XSTRNCPY((char*)(buff + idx), "NIST CURVE: ", wsz); - idx += wsz; + idx += wsz -1; wsz = (int)XSTRLEN(nistCurveName); - XSTRNCPY((char*)(buff + idx), nistCurveName, wsz); + XSTRNCPY((char*)(buff + idx), nistCurveName, wsz +1); idx += wsz; - wsz = sizeof("\n") - 1; + wsz = sizeof("\n"); XSTRNCPY((char*)(buff + idx), "\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7299,16 +7299,16 @@ static int PrintPubKeyDSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("DSA Public-Key: (") - 1; + wsz = sizeof("DSA Public-Key: ("); XSTRNCPY((char*)(buff + idx), "DSA Public-Key: (", wsz); - idx += wsz; + idx += wsz -1; wsz = ToDec(bitlen, buff + idx); idx += wsz; - wsz = sizeof(" bit)\n") - 1; + wsz = sizeof(" bit)\n"); XSTRNCPY((char*)(buff + idx), " bit)\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7318,9 +7318,9 @@ static int PrintPubKeyDSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("pub:\n") - 1; + wsz = sizeof("pub:\n"); XSTRNCPY((char*)(buff + idx), "pub:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7332,9 +7332,9 @@ static int PrintPubKeyDSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("P:\n") - 1; + wsz = sizeof("P:\n"); XSTRNCPY((char*)(buff + idx), "P:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7346,9 +7346,9 @@ static int PrintPubKeyDSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("Q:\n") - 1; + wsz = sizeof("Q:\n"); XSTRNCPY((char*)(buff + idx), "Q:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7360,9 +7360,9 @@ static int PrintPubKeyDSA(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("G:\n") - 1; + wsz = sizeof("G:\n"); XSTRNCPY((char*)(buff + idx), "G:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7454,16 +7454,16 @@ static int PrintPubKeyDH(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("DH Public-Key: (") - 1; + wsz = sizeof("DH Public-Key: ("); XSTRNCPY((char*)(buff + idx), "DH Public-Key: (", wsz); - idx += wsz; + idx += wsz -1; wsz = ToDec(bitlen, buff + idx); idx += wsz; - wsz = sizeof(" bit)\n") - 1; + wsz = sizeof(" bit)\n"); XSTRNCPY((char*)(buff + idx), " bit)\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7472,9 +7472,9 @@ static int PrintPubKeyDH(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("public-key:\n") - 1; + wsz = sizeof("public-key:\n"); XSTRNCPY((char*)(buff + idx), "public-key:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7485,9 +7485,9 @@ static int PrintPubKeyDH(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("prime:\n") - 1; + wsz = sizeof("prime:\n"); XSTRNCPY((char*)(buff + idx), "prime:\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff)); @@ -7498,23 +7498,23 @@ static int PrintPubKeyDH(WOLFSSL_BIO* out, const byte* pkey, int pkeySz, wsz = Indent(indent, buff + idx); idx += wsz; - wsz = sizeof("generator: ") - 1; + wsz = sizeof("generator: "); XSTRNCPY((char*)(buff + idx), "generator: ", wsz); - idx += wsz; + idx += wsz -1; wsz = ToDec(generator, buff + idx); idx += wsz; - wsz = sizeof(" (0x") - 1; + wsz = sizeof(" (0x"); XSTRNCPY((char*)(buff + idx), " (0x", wsz); - idx += wsz; + idx += wsz -1; wsz = ToHex(generator, buff + idx); idx += wsz; - wsz = sizeof(")\n") - 1; + wsz = sizeof(")\n"); XSTRNCPY((char*)(buff + idx), ")\n", wsz); - idx += wsz; + idx += wsz -1; wolfSSL_BIO_write(out, buff, idx); XMEMSET(buff, 0, sizeof(buff));