From b28ac4039df7f04d8bb743cc1741a4a31c52e270 Mon Sep 17 00:00:00 2001 From: emboss Date: Thu, 20 Dec 2012 00:32:09 +0000 Subject: [PATCH] * 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 --- ChangeLog | 6 ++++++ test/openssl/test_pkey_dh.rb | 3 +-- 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 + + * 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 * 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)