emboss	2012-12-20 09:32:09 +0900 (Thu, 20 Dec 2012)

  New Revision: 38482

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

  Log:
    * test/openssl/test_pkey_dh.rb: revert special treatment of
      FIPS-capable installations since FIPS mode is now disabled for the
      tests.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_pkey_dh.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38481)
+++ ChangeLog	(revision 38482)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Dec 20 10:29:58 2012  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* test/openssl/test_pkey_dh.rb: revert special treatment of
+	  FIPS-capable installations since FIPS mode is now disabled for the
+	  tests.
+
 Thu Dec 20 10:23:12 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* ext/openssl/ossl.c: add OpenSSL.fips_mode= to allow enabling FIPS
Index: test/openssl/test_pkey_dh.rb
===================================================================
--- test/openssl/test_pkey_dh.rb	(revision 38481)
+++ test/openssl/test_pkey_dh.rb	(revision 38482)
@@ -4,8 +4,7 @@ if defined?(OpenSSL) https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkey_dh.rb#L4
 
 class OpenSSL::TestPKeyDH < Test::Unit::TestCase
 
-  # improve test performance for non-FIPS installations
-  NEW_KEYLEN = OpenSSL::OPENSSL_FIPS ? 1024 : 256
+  NEW_KEYLEN = 256
 
   def test_new
     dh = OpenSSL::PKey::DH.new(NEW_KEYLEN)

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