1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/openssl] Allow empty string to OpenSSL::Cipher#update

Browse Source 
For some reasons, plaintext may be empty string.

ref https://www.rfc-editor.org/rfc/rfc9001.html#section-5.8

https://github.com/ruby/openssl/commit/953592a29e
This commit is contained in:
Yusuke Nakamura 2022-11-23 21:05:49 +09:00 committed by Hiroshi SHIBATA
parent d92f4fe4d7
commit d4dce27d89
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/openssl/ossl_cipher.c
View File

@ -384,8 +384,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
StringValue(data); StringValue(data);
in = (unsigned char *)RSTRING_PTR(data); in = (unsigned char *)RSTRING_PTR(data);
if ((in_len = RSTRING_LEN(data)) == 0) in_len = RSTRING_LEN(data);
ossl_raise(rb_eArgError, "data must not be empty");
GetCipher(self, ctx); GetCipher(self, ctx);
out_len = in_len+EVP_CIPHER_CTX_block_size(ctx); out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
if (out_len <= 0) { if (out_len <= 0) {

6
test/openssl/test_cipher.rb
View File

@ -108,12 +108,6 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
assert_not_equal s1, s2 assert_not_equal s1, s2
end end
def test_empty_data
cipher = OpenSSL::Cipher.new("DES-EDE3-CBC").encrypt
cipher.random_key
assert_raise(ArgumentError) { cipher.update("") }
end
def test_initialize def test_initialize
cipher = OpenSSL::Cipher.new("DES-EDE3-CBC") cipher = OpenSSL::Cipher.new("DES-EDE3-CBC")
assert_raise(RuntimeError) { cipher.__send__(:initialize, "DES-EDE3-CBC") } assert_raise(RuntimeError) { cipher.__send__(:initialize, "DES-EDE3-CBC") }