From ab509c0edb4d2631772018cebbbb5dd3c06b0582 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sun, 30 Oct 2005 20:50:48 +0000 Subject: * ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must not be empty. [ruby-talk:161220] * test/openssl/test_cipher.rb: add test for Cipher#update(""). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/openssl/ossl_cipher.c | 3 ++- test/openssl/test_cipher.rb | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb9e40f11f..2796190be7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Oct 31 05:46:08 2005 GOTOU Yuuzou + + * ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must + not be empty. [ruby-talk:161220] + + * test/openssl/test_cipher.rb: add test for Cipher#update(""). + Mon Oct 31 05:38:26 2005 GOTOU Yuuzou * lib/webrick/httpservlet/cgihandler.rb diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index f90fb2477a..bc72d7e538 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -224,7 +224,8 @@ ossl_cipher_update(VALUE self, VALUE data) StringValue(data); in = RSTRING(data)->ptr; - in_len = RSTRING(data)->len; + if ((in_len = RSTRING(data)->len) == 0) + rb_raise(rb_eArgError, "data must not be empty"); GetCipher(self, ctx); str = rb_str_new(0, in_len+EVP_CIPHER_CTX_block_size(ctx)); if (!EVP_CipherUpdate(ctx, RSTRING(str)->ptr, &out_len, in, in_len)) diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb index 8711e46aa2..c84b47b7f4 100644 --- a/test/openssl/test_cipher.rb +++ b/test/openssl/test_cipher.rb @@ -57,6 +57,11 @@ class OpenSSL::TestCipher < Test::Unit::TestCase s2 = @c1.update(@data) + @c1.final assert_equal(s1, s2, "encrypt reset") end + + def test_empty_data + @c1.encrypt + assert_raises(ArgumentError){ @c1.update("") } + end end end -- cgit v1.2.3