diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2023-11-11 16:36:39 -0800 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2024-05-02 16:26:11 +0900 |
| commit | 55720f372d65aaa14bf6925730f0c715f0179dc5 (patch) | |
| tree | ddbaaab81fe38379444bab961773a4f7277521ad | |
| parent | c9aa63a9e06c21566c6fadda5945f04f341e4891 (diff) | |
[ruby/openssl] pkcs7: raise PKCS7Error for PKCS7 without content in PKCS7.read_smime
[pkuzco: expanded the fix for other content types]
[ky: adjusted formatting and the exception type]
https://github.com/ruby/openssl/commit/07eceb7f63
Co-authored-by: pkuzco <b.naamneh@gmail.com>
Co-authored-by: Kazuki Yamaguchi <k@rhe.jp>
| -rw-r--r-- | ext/openssl/ossl_pkcs7.c | 6 | ||||
| -rw-r--r-- | test/openssl/test_pkcs7.rb | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index cde2ac04a4..aeeb4bf5f4 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -165,7 +165,11 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg) out = NULL; pkcs7 = SMIME_read_PKCS7(in, &out); BIO_free(in); - if(!pkcs7) ossl_raise(ePKCS7Error, NULL); + if (!pkcs7) + ossl_raise(ePKCS7Error, "Could not parse the PKCS7"); + if (!pkcs7->d.ptr) + ossl_raise(ePKCS7Error, "No content in PKCS7"); + data = out ? ossl_membio2str(out) : Qnil; SetPKCS7(ret, pkcs7); ossl_pkcs7_set_data(ret, data); diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb index fa15bdbca7..96f3f1f6be 100644 --- a/test/openssl/test_pkcs7.rb +++ b/test/openssl/test_pkcs7.rb @@ -158,6 +158,16 @@ class OpenSSL::TestPKCS7 < OpenSSL::TestCase def test_empty_signed_data_ruby_bug_19974 data = "-----BEGIN PKCS7-----\nMAsGCSqGSIb3DQEHAg==\n-----END PKCS7-----\n" assert_raise(ArgumentError) { OpenSSL::PKCS7.new(data) } + + data = <<END +MIME-Version: 1.0 +Content-Disposition: attachment; filename="smime.p7m" +Content-Type: application/x-pkcs7-mime; smime-type=signed-data; name="smime.p7m" +Content-Transfer-Encoding: base64 + +#{data} +END + assert_raise(OpenSSL::PKCS7::PKCS7Error) { OpenSSL::PKCS7.read_smime(data) } end def test_graceful_parsing_failure #[ruby-core:43250] |