Use OSSL source directly, test still fails with off by-n errs in AES …

…128 CBC
WillChilds-Klein · Sep 13, 2024 · 9a72ace · 9a72ace
1 parent 94c275e
commit 9a72ace
Show file tree

Hide file tree

Showing 2 changed files with 755 additions and 352 deletions.
diff --git a/crypto/bio/bio_deprecated_test.cc b/crypto/bio/bio_deprecated_test.cc
@@ -29,6 +29,7 @@ static const struct CipherParams Ciphers[] = {
     {"AES_128_CTR", EVP_aes_128_ctr},
     {"AES_128_GCM", EVP_aes_128_gcm},
     {"AES_128_OFB", EVP_aes_128_ofb},
+    {"AES_128_CBC", EVP_aes_128_cbc},
     {"AES_256_CTR", EVP_aes_256_ctr},
     {"AES_256_GCM", EVP_aes_256_gcm},
     {"AES_256_OFB", EVP_aes_256_ofb},
@@ -61,15 +62,15 @@ TEST_P(DeprecatedTest, Cipher) {
   ASSERT_TRUE(RAND_bytes(iv, sizeof(iv)));
 
   // Unsupported or unimplemented CTRL flags and cipher(s)
-  bio_cipher.reset(BIO_new(BIO_f_cipher()));
-  ASSERT_TRUE(bio_cipher);
-  EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_CTRL_DUP, 0, NULL));
-  EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_CTRL_GET_CALLBACK, 0, NULL));
-  EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_CTRL_SET_CALLBACK, 0, NULL));
-  EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_C_DO_STATE_MACHINE, 0, NULL));
-  EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_C_GET_CIPHER_CTX, 0, NULL));
-  EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_C_SSL_MODE, 0, NULL));
-  EXPECT_FALSE(BIO_set_cipher(bio_cipher.get(), EVP_rc4(), key, iv, /*enc*/ 1));
+  //bio_cipher.reset(BIO_new(BIO_f_cipher()));
+  //ASSERT_TRUE(bio_cipher);
+  //EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_CTRL_DUP, 0, bio_cipher.get()));
+  //EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_CTRL_GET_CALLBACK, 0, NULL));
+  //EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_CTRL_SET_CALLBACK, 0, NULL));
+  //EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_C_DO_STATE_MACHINE, 0, NULL));
+  //EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_C_GET_CIPHER_CTX, 0, NULL));
+  //EXPECT_FALSE(BIO_ctrl(bio_cipher.get(), BIO_C_SSL_MODE, 0, NULL));
+  //EXPECT_FALSE(BIO_set_cipher(bio_cipher.get(), EVP_rc4(), key, iv, /*enc*/ 1));
 
   // Round-trip using only |BIO_read|, backing mem buffer with pt/ct. Fixed size
   // IO.
@@ -137,11 +138,7 @@ TEST_P(DeprecatedTest, Cipher) {
 
   // Test a number of different IO sizes around byte, word, cipher block,
   // BIO internal buffer size, and other boundaries.
-  int io_sizes[] = {1,
-                    3,
-                    7,
-                    8,
-                    9,
+  int io_sizes[] = {
                     64,
                     923,
                     2 * ENC_BLOCK_SIZE,