summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-20 00:32:09 +0000
committeremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-20 00:32:09 +0000
commitb28ac4039df7f04d8bb743cc1741a4a31c52e270 (patch)
treeb51f7e7debe7f8e2258b67e10d4b2ceed86089f0
parent9fbdf1e34749e662460b43e00cd7c75b0176773d (diff)
* test/openssl/test_pkey_dh.rb: revert special treatment of
FIPS-capable installations since FIPS mode is now disabled for the tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/openssl/test_pkey_dh.rb3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 745220f651..4c53d8d94d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 20 10:29:58 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+ * 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@gmail.com>
* ext/openssl/ossl.c: add OpenSSL.fips_mode= to allow enabling FIPS
diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
index 7c7596f193..160a131c06 100644
--- a/test/openssl/test_pkey_dh.rb
+++ b/test/openssl/test_pkey_dh.rb
@@ -4,8 +4,7 @@ if defined?(OpenSSL)
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)