diff options
-rw-r--r-- | ChangeLog | 19 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_ec.c | 4 | ||||
-rw-r--r-- | test/openssl/test_pkey_ec.rb | 32 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 44 insertions, 17 deletions
@@ -1,3 +1,22 @@ +Thu Oct 31 22:28:04 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] + +Thu Oct 31 22:28:04 2013 Martin Bosslet <Martin.Bosslet@gmail.com> + + * ext/openssl/ossl_pkey_ec.c: Ensure compatibility to builds of + OpenSSL with OPENSSL_NO_EC2M defined, but OPENSSL_NO_EC not + defined. + * test/openssl/test_pkey_ec.rb: Iterate over built-in curves + (and assert their non-emptiness!) instead of hard-coding them, as + this may cause problems with respect to the different availability + of individual curves in individual OpenSSL builds. + [ruby-core:54881] [Bug #8384] + + Thanks to Vit Ondruch for providing the patch! + Sun Oct 27 01:04:28 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * lib/rubygems: Update to RubyGems 2.0.13. [ruby-core:58031] diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index 8e6d88f606..29e28ca2f4 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -762,8 +762,10 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self) method = EC_GFp_mont_method(); } else if (id == s_GFp_nist) { method = EC_GFp_nist_method(); +#if !defined(OPENSSL_NO_EC2M) } else if (id == s_GF2m_simple) { method = EC_GF2m_simple_method(); +#endif } if (method) { @@ -817,8 +819,10 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self) if (id == s_GFp) { new_curve = EC_GROUP_new_curve_GFp; +#if !defined(OPENSSL_NO_EC2M) } else if (id == s_GF2m) { new_curve = EC_GROUP_new_curve_GF2m; +#endif } else { ossl_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m"); } diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb index f151335b6e..5ceea4c867 100644 --- a/test/openssl/test_pkey_ec.rb +++ b/test/openssl/test_pkey_ec.rb @@ -7,28 +7,29 @@ class OpenSSL::TestEC < Test::Unit::TestCase @data1 = 'foo' @data2 = 'bar' * 1000 # data too long for DSA sig - @group1 = OpenSSL::PKey::EC::Group.new('secp112r1') - @group2 = OpenSSL::PKey::EC::Group.new('sect163k1') - @group3 = OpenSSL::PKey::EC::Group.new('prime256v1') + @groups = [] + @keys = [] - @key1 = OpenSSL::PKey::EC.new - @key1.group = @group1 - @key1.generate_key + 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) - @key2 = OpenSSL::PKey::EC.new(@group2.curve_name) - @key2.generate_key + key = OpenSSL::PKey::EC.new(group) + key.generate_key - @key3 = OpenSSL::PKey::EC.new(@group3) - @key3.generate_key - - @groups = [@group1, @group2, @group3] - @keys = [@key1, @key2, @key3] + @groups << group + @keys << key + end end def compare_keys(k1, k2) assert_equal(k1.to_pem, k2.to_pem) end + def test_builtin_curves + assert(!OpenSSL::PKey::EC.builtin_curves.empty?) + end + def test_curve_names @groups.each_with_index do |group, idx| key = @keys[idx] @@ -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,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-10-27" -#define RUBY_PATCHLEVEL 342 +#define RUBY_RELEASE_DATE "2013-10-31" +#define RUBY_PATCHLEVEL 343 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |