From 9871dd5783963ad3d341ddb58f6bfe7ca7ceb444 Mon Sep 17 00:00:00 2001
From: emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 28 Aug 2012 20:03:32 +0000
Subject: * test/openssl/utils.rb   test/openssl/test_pair.rb  
 test/openssl/test_pkey_dh.rb: Use 1024 bit DH parameters to satisfy   OpenSSL
 FIPS requirements. Patch by Vit Ondruch.   [Bug #6938] [ruby-core:47326]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/openssl/test_pkey_dh.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'test/openssl/test_pkey_dh.rb')

diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
index 79a3e0a92c..d261c8f215 100644
--- a/test/openssl/test_pkey_dh.rb
+++ b/test/openssl/test_pkey_dh.rb
@@ -4,19 +4,19 @@ if defined?(OpenSSL)
 
 class OpenSSL::TestPKeyDH < Test::Unit::TestCase
   def test_new
-    dh = OpenSSL::PKey::DH.new(256)
+    dh = OpenSSL::PKey::DH.new(1024)
     assert_key(dh)
   end
 
   def test_new_break
-    assert_nil(OpenSSL::PKey::DH.new(256) { break })
+    assert_nil(OpenSSL::PKey::DH.new(1024) { break })
     assert_raises(RuntimeError) do
-      OpenSSL::PKey::DH.new(256) { raise }
+      OpenSSL::PKey::DH.new(1024) { raise }
     end
   end
 
   def test_to_der
-    dh = OpenSSL::PKey::DH.new(256)
+    dh = OpenSSL::TestUtils::TEST_KEY_DH1024
     der = dh.to_der
     dh2 = OpenSSL::PKey::DH.new(der)
     assert_equal_params(dh, dh2)
@@ -24,7 +24,7 @@ class OpenSSL::TestPKeyDH < Test::Unit::TestCase
   end
 
   def test_to_pem
-    dh = OpenSSL::PKey::DH.new(256)
+    dh = OpenSSL::TestUtils::TEST_KEY_DH1024
     pem = dh.to_pem
     dh2 = OpenSSL::PKey::DH.new(pem)
     assert_equal_params(dh, dh2)
@@ -32,7 +32,7 @@ class OpenSSL::TestPKeyDH < Test::Unit::TestCase
   end
 
   def test_public_key
-    dh = OpenSSL::PKey::DH.new(256)
+    dh = OpenSSL::TestUtils::TEST_KEY_DH1024
     public_key = dh.public_key
     assert_no_key(public_key) #implies public_key.public? is false!
     assert_equal(dh.to_der, public_key.to_der)
@@ -40,14 +40,14 @@ class OpenSSL::TestPKeyDH < Test::Unit::TestCase
   end
 
   def test_generate_key
-    dh = OpenSSL::TestUtils::TEST_KEY_DH512.public_key # creates a copy
+    dh = OpenSSL::TestUtils::TEST_KEY_DH512_PUB.public_key # creates a copy
     assert_no_key(dh)
     dh.generate_key!
     assert_key(dh)
   end
 
   def test_key_exchange
-    dh = OpenSSL::TestUtils::TEST_KEY_DH512
+    dh = OpenSSL::TestUtils::TEST_KEY_DH512_PUB
     dh2 = dh.public_key
     dh.generate_key!
     dh2.generate_key!
-- 
cgit v1.2.3