diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-31 15:09:12 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-31 15:09:12 +0000 |
commit | b8a95c0f4a42afea2948e76d1ad23acea42be5bd (patch) | |
tree | 702e5bf4a0a6783277306658f100b00991e6a507 | |
parent | c84f858379b09a5831d82f989df512683e199eb8 (diff) |
merge revision(s) 41829: [Backport #8384]
* test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as
they are not suitable for ECDSA.
[ruby-core:54881] [Bug #8384]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@43494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/openssl/test_pkey_ec.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Nov 1 00:08:21 2013 Martin Bosslet <Martin.Bosslet@gmail.com> + + * test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as + they are not suitable for ECDSA. + [ruby-core:54881] [Bug #8384] + Fri Nov 1 00:04:17 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * parse.y: Remove +(binary) and -(binary) special cases diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb index 85ba7e8025..0856c2785e 100644 --- a/test/openssl/test_pkey_ec.rb +++ b/test/openssl/test_pkey_ec.rb @@ -11,6 +11,7 @@ class OpenSSL::TestEC < Test::Unit::TestCase @keys = [] OpenSSL::PKey::EC.builtin_curves.each do |curve, comment| + next if curve.start_with?("Oakley") # Oakley curves are not suitable for ECDSA group = OpenSSL::PKey::EC::Group.new(curve) key = OpenSSL::PKey::EC.new(group) @@ -44,11 +45,12 @@ class OpenSSL::TestEC < Test::Unit::TestCase end end - def test_encoding + def test_group_encoding for group in @groups for meth in [:to_der, :to_pem] txt = group.send(meth) gr = OpenSSL::PKey::EC::Group.new(txt) + assert_equal(txt, gr.send(meth)) assert_equal(group.generator.to_bn, gr.generator.to_bn) @@ -58,7 +60,9 @@ class OpenSSL::TestEC < Test::Unit::TestCase assert_equal(group.degree, gr.degree) end end + end + def test_key_encoding for key in @keys group = key.group @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 481 +#define RUBY_PATCHLEVEL 482 #define RUBY_RELEASE_DATE "2013-11-01" #define RUBY_RELEASE_YEAR 2013 |