changes from peer review

Author: JacobBarthelmeh

src/we_aes_block.c

@@ -180,15 +180,14 @@ static int we_aes_cbc_decrypt(we_AesBlock* aes, unsigned char *out,
 
     /* padding is handled by OpenSSL before passed to we_aes_cbc_decrypt */
     rc = wc_AesCbcDecrypt(&aes->aes, out, in, (unsigned int)len);
-    if (rc != 0) {
+    if (rc <= 0) {
         ret = -1;
     }
-
-    if (ret >= 0) {
+    else {
         ret = (int)len;
     }
 
-    WOLFENGINE_LEAVE(WE_LOG_CIPHER, "we_aes_cbc_encrypt", ret);
+    WOLFENGINE_LEAVE(WE_LOG_CIPHER, "we_aes_cbc_decrypt", ret);
     return ret;
 }
 

src/we_des3_cbc.c

@@ -85,13 +85,11 @@ static int we_des3_cbc_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             WOLFENGINE_ERROR_FUNC(WE_LOG_CIPHER, "wc_Des3Init", rc);
             ret = 0;
         }
+
         des3->init = 1;
-        if (iv == NULL) {
-            des3->ivSet = 0;
-        }
-        else {
-            des3->ivSet = 1;
-        }
+
+        /* set des3->ivSet to 1 if iv buffer passed in is not NULL */
+        des3->ivSet = (iv == NULL);
     }
 
     if (ret == 1) {