Fix merge issues

aws · Nov 25, 2024 · 66f4dc7 · 66f4dc7
1 parent f95b3f7
commit 66f4dc7
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 399 deletions.
diff --git a/crypto/fipsmodule/rsa/rsa.c b/crypto/fipsmodule/rsa/rsa.c
@@ -969,16 +969,6 @@ int rsa_verify_no_self_test(int hash_nid, const uint8_t *digest,
 
   // Check that the computed hash matches the expected hash
   if (OPENSSL_memcmp(buf, signed_msg, len) != 0) {
-    printf("BUF 1: ");
-    for (size_t ii = 0; ii < len; ii++) {
-      printf("%02X", (unsigned)buf[ii]);
-    }
-    printf("\n");
-    printf("BUF 2: ");
-    for (size_t ii = 0; ii < len; ii++) {
-      printf("%02X", (unsigned)signed_msg[ii]);
-    }
-    printf("\n");
     OPENSSL_PUT_ERROR(RSA, RSA_R_MISMATCHED_SIGNATURE);
     goto out;
   }

diff --git a/crypto/pkcs7/bio/cipher_test.cc b/crypto/pkcs7/bio/cipher_test.cc
diff --git a/crypto/pkcs7/pkcs7.c b/crypto/pkcs7/pkcs7.c
@@ -1001,7 +1001,7 @@ OPENSSL_END_ALLOW_DEPRECATED
         continue;
       }
       int sign_nid = OBJ_obj2nid(si->digest_alg->algorithm);
-      bio_tmp = pkcs7_find_digest(&md_ctx, bio_tmp, sign_nid);
+      bio_tmp = pkcs7_find_digest(&md_ctx, bio, sign_nid);
       if (bio_tmp == NULL) {
         goto err;
       }