Fix from testing

Author: embhorn

src/ssl_bn.c

@@ -1138,6 +1138,8 @@ int wolfSSL_BN_cmp(const WOLFSSL_BIGNUM* a, const WOLFSSL_BIGNUM* b)
         ret = 1;
     }
     else {
+        PRAGMA_GCC_DIAG_PUSH
+        PRAGMA_GCC("GCC diagnostic ignored \"-Werror=duplicated-branches\"")
         /* Compare big numbers with wolfCrypt. */
         ret = mp_cmp((mp_int*)a->internal, (mp_int*)b->internal);
         /* Convert wolfCrypt return value. */
@@ -1151,13 +1153,11 @@ int wolfSSL_BN_cmp(const WOLFSSL_BIGNUM* a, const WOLFSSL_BIGNUM* b)
             ret = -1;
         }
         else {
-            PRAGMA_GCC_DIAG_PUSH
-            PRAGMA_GCC("GCC diagnostic ignored \"-Werror=duplicated-branches\"")
             /* ignored warning here because the same return value
                was intentional */
             ret = WOLFSSL_FATAL_ERROR; /* also -1 */
-            PRAGMA_GCC_DIAG_POP
         }
+        PRAGMA_GCC_DIAG_POP
     }
 
     return ret;

src/x509.c

@@ -27,6 +27,8 @@
     #endif
 #else
 
+#pragma GCC diagnostic ignored "-Wformat-truncation"  
+
 #ifndef WOLFCRYPT_ONLY
 
 #ifndef NO_CERTS
@@ -1474,12 +1476,6 @@ static WOLFSSL_ASN1_STRING* wolfSSL_X509_EXTENSION_get_data_internal(
 
 
 #ifndef NO_BIO
-
-#ifndef MAX_INDENT
-    #define MAX_INDENT 40
-#endif
-
-
 /* Return 0 on success and 1 on failure. Copies ext data to bio, using indent
  *  to pad the output. flag is ignored. */
 int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
@@ -1494,9 +1490,6 @@ int wolfSSL_X509V3_EXT_print(WOLFSSL_BIO *out, WOLFSSL_X509_EXTENSION *ext,
     int tmpLen = 0;
     WOLFSSL_ENTER("wolfSSL_X509V3_EXT_print");
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     if ((out == NULL) || (ext == NULL)) {
         WOLFSSL_MSG("NULL parameter error");
         return rc;
@@ -6329,9 +6322,6 @@ static int X509PrintKeyUsage(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
         "Decipher Only"
     };
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     if (bio == NULL || x509 == NULL) {
         ret = WOLFSSL_FAILURE;
     }
@@ -6503,9 +6493,6 @@ static int X509PrintSerial(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
     unsigned char serial[32];
     int  sz = sizeof(serial);
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     XMEMSET(serial, 0, sz);
     if (wolfSSL_X509_get_serial_number(x509, serial, &sz) == WOLFSSL_SUCCESS) {
         X509PrintSerial_ex(bio, serial, sz, 1, indent);
@@ -6598,9 +6585,6 @@ static int X509PrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
     int  count, i;
     char* buf = NULL;
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     count = wolfSSL_X509_get_ext_count(x509);
     if (count <= 0)
         return WOLFSSL_SUCCESS;
@@ -7014,9 +6998,6 @@ static int X509PrintPubKey(WOLFSSL_BIO* bio, WOLFSSL_X509* x509, int indent)
     int len;
     int ret = WOLFSSL_SUCCESS;
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     if (bio == NULL || x509 == NULL)
         return BAD_FUNC_ARG;
 
@@ -7104,9 +7085,6 @@ static int X509PrintVersion(WOLFSSL_BIO* bio, int version, int indent)
     char scratch[MAX_WIDTH];
     int scratchLen;
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     scratchLen = XSNPRINTF(scratch, MAX_WIDTH, "%*s%s", indent, "", "Version:");
     if ((scratchLen < 0) || (scratchLen >= MAX_WIDTH)) {
         return WOLFSSL_FAILURE;
@@ -7140,9 +7118,6 @@ static int X509PrintReqAttributes(WOLFSSL_BIO* bio, WOLFSSL_X509* x509,
     int scratchLen;
     int i = 0;
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     if ((scratchLen = XSNPRINTF(scratch, MAX_WIDTH,
                                  "%*s%s", indent, "", "Attributes: \n"))
         >= MAX_WIDTH)
@@ -8890,9 +8865,6 @@ static int X509RevokedPrintSerial(WOLFSSL_BIO* bio, RevokedCert* rev,
     unsigned char serial[32];
     int  sz = sizeof(serial);
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     XMEMSET(serial, 0, sz);
     if (wolfSSL_X509_REVOKED_get_serial_number(rev, serial, &sz)
             == WOLFSSL_SUCCESS) {
@@ -8951,12 +8923,9 @@ static int X509CRLPrintSignature(WOLFSSL_BIO* bio, WOLFSSL_X509_CRL* crl,
 static int X509CRLPrintExtensions(WOLFSSL_BIO* bio, WOLFSSL_X509_CRL* crl,
         int indent)
 {
-    char tmp[MAX_WIDTH];
+    char tmp[MAX_WIDTH]; /* buffer for XSNPRINTF */
     int  ret = 0;
 
-    if (indent < 0) indent = 0;
-    if (indent > MAX_INDENT) indent = MAX_INDENT;
-
     if (XSNPRINTF(tmp, MAX_WIDTH, "%*s%s\n", indent, "",
                 "CRL extensions:") >= MAX_WIDTH) {
         ret = WOLFSSL_FAILURE;

wolfcrypt/src/evp.c

@@ -8517,8 +8517,8 @@ void wolfSSL_EVP_init(void)
     }
 
     /* Return length on ok */
-    int wolfSSL_EVP_Cipher(WOLFSSL_EVP_CIPHER_CTX* ctx, byte* dst, byte* src,
-                           word32 len)
+    int wolfSSL_EVP_Cipher(WOLFSSL_EVP_CIPHER_CTX* ctx, byte* dst,
+                           const byte* src, word32 len)
     {
         int ret = WC_NO_ERR_TRACE(WOLFSSL_FAILURE);
 

wolfssl/openssl/evp.h

@@ -892,7 +892,7 @@ WOLFSSL_API int  wolfSSL_EVP_CIPHER_CTX_set_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, byte
 WOLFSSL_API int  wolfSSL_EVP_CIPHER_CTX_get_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, byte* iv,
                                                      int ivLen);
 WOLFSSL_API int  wolfSSL_EVP_Cipher(WOLFSSL_EVP_CIPHER_CTX* ctx,
-                          unsigned char* dst, unsigned char* src,
+                          unsigned char* dst, const unsigned char* src,
                           unsigned int len);
 
 WOLFSSL_API const WOLFSSL_EVP_CIPHER* wolfSSL_EVP_get_cipherbynid(int id);