Add back BIO encrypt/decrypt, tests passing

aws · Nov 15, 2024 · bd4e275 · bd4e275
1 parent cb03225
commit bd4e275
Show file tree

Hide file tree

Showing 7 changed files with 557 additions and 21 deletions.
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
@@ -681,7 +681,8 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, const unsigned char **in,
     cont = *in;
     len = p - cont + plen;
     p += plen;
-  } else if (cst) {
+    // TODO [childw] explain
+  // } else if (cst) {
     // This parser historically supported BER constructed strings. We no
     // longer do and will gradually tighten this parser into a DER
     // parser. BER types should use |CBS_asn1_ber_to_der|.

diff --git a/crypto/pkcs7/bio/bio_cipher_test.cc b/crypto/pkcs7/bio/bio_cipher_test.cc
@@ -13,9 +13,6 @@
 // NOTE: need to keep this in sync with sizeof(ctx->buf) cipher.c
 #define ENC_BLOCK_SIZE 1024 * 4
 
-#define BIO_get_cipher_status(bio) \
-  BIO_ctrl(bio, BIO_C_GET_CIPHER_STATUS, 0, NULL)
-
 struct CipherParams {
   const char name[40];
   const EVP_CIPHER *(*cipher)(void);

diff --git a/crypto/pkcs7/bio/cipher.c b/crypto/pkcs7/bio/cipher.c
@@ -326,3 +326,7 @@ const BIO_METHOD *BIO_f_cipher(void) { return &methods_enc; }
 int BIO_get_cipher_ctx(BIO *b, EVP_CIPHER_CTX **ctx) {
   return BIO_ctrl(b, BIO_C_GET_CIPHER_CTX, 0, ctx);
 }
+
+int BIO_get_cipher_status(BIO *b) {
+  return BIO_ctrl(b, BIO_C_GET_CIPHER_STATUS, 0, NULL);
+}