2 files changed, 18 insertions, 15 deletions
@@ -259,7 +259,14 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
 /*
 * call-seq:
- * PKCS7.encrypt(certs, data, [, cipher [, flags]]) => pkcs7
 */
 static VALUE
 ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
@@ -273,21 +280,12 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 PKCS7 *p7;
 rb_scan_args(argc, argv, "22", &certs, &data, &cipher, &flags);
- if(NIL_P(cipher)){
-#if !defined(OPENSSL_NO_RC2)
-	ciph = EVP_rc2_40_cbc();
-#elif !defined(OPENSSL_NO_DES)
-	ciph = EVP_des_ede3_cbc();
-#elif !defined(OPENSSL_NO_RC2)
-	ciph = EVP_rc2_40_cbc();
-#elif !defined(OPENSSL_NO_AES)
-	ciph = EVP_EVP_aes_128_cbc();
-#else
-	ossl_raise(ePKCS7Error, "Must specify cipher");
-#endif
-
 }
- else ciph = ossl_evp_get_cipherbyname(cipher);
 flg = NIL_P(flags) ? 0 : NUM2INT(flags);
 ret = NewPKCS7(cPKCS7);
 in = ossl_obj2bio(&data);
@@ -153,6 +153,11 @@ class OpenSSL::TestPKCS7 < OpenSSL::TestCase
 assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
 assert_equal(data, p7.decrypt(@rsa1024))
 end
 def test_empty_signed_data_ruby_bug_19974