summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/openssl/test_cipher.rb6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e8d0f8379..94cc44dfa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 19 07:43:52 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * test/openssl/test_cipher.rb: Correct a typo
+ by jgls <joerg@joergleis.com>
+ https://github.com/ruby/ruby/pull/291 fix GH-291
+
Thu Apr 18 16:58:51 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_method.c (rb_mod_public_method): fix visibility on anonymous
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index 15cfb7b302..088dbc140d 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -133,7 +133,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
end
end
- if has_ciphers?(['aes-128-gcm', 'aes-192-gcm', 'aes-128-gcm'])
+ if has_ciphers?(['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm'])
def test_authenticated
cipher = OpenSSL::Cipher.new('aes-128-gcm')
@@ -143,7 +143,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
end
def test_aes_gcm
- ['aes-128-gcm', 'aes-192-gcm', 'aes-128-gcm'].each do |algo|
+ ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm'].each do |algo|
pt = "You should all use Authenticated Encryption!"
cipher, key, iv = new_encryptor(algo)
@@ -161,7 +161,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
end
def test_aes_gcm_short_tag
- ['aes-128-gcm', 'aes-192-gcm', 'aes-128-gcm'].each do |algo|
+ ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm'].each do |algo|
pt = "You should all use Authenticated Encryption!"
cipher, key, iv = new_encryptor(algo)