usa	2013-11-01 00:09:12 +0900 (Fri, 01 Nov 2013)

  New Revision: 43494

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43494

  Log:
    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]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/openssl/test_pkey_ec.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 43493)
+++ ruby_1_9_3/ChangeLog	(revision 43494)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Nov  1 00:08:21 2013  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* 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@m...>
 
 	* parse.y: Remove +(binary) and -(binary) special cases
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 43493)
+++ ruby_1_9_3/version.h	(revision 43494)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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
Index: ruby_1_9_3/test/openssl/test_pkey_ec.rb
===================================================================
--- ruby_1_9_3/test/openssl/test_pkey_ec.rb	(revision 43493)
+++ ruby_1_9_3/test/openssl/test_pkey_ec.rb	(revision 43494)
@@ -11,6 +11,7 @@ class OpenSSL::TestEC < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/openssl/test_pkey_ec.rb#L11
     @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::Test https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/openssl/test_pkey_ec.rb#L45
     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::Test https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/openssl/test_pkey_ec.rb#L60
         assert_equal(group.degree, gr.degree)
       end
     end
+  end
 
+  def test_key_encoding
     for key in @keys
       group = key.group
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41829


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/