diff options
| author | hsbt <hsbt@ruby-lang.org> | 2016-01-16 07:51:24 +0000 |
|---|---|---|
| committer | hsbt <hsbt@ruby-lang.org> | 2016-01-16 07:51:24 +0000 |
| commit | 8842d715e113b26a645c76d9b738e8787f3cbe29 (patch) | |
| tree | 9c8240bb88f607832bcb7ec488a06afc30117e57 | |
| parent | cb367fde59549f64973da22eac739417590ead6a (diff) | |
| download | ruby-openssl-history-8842d715e113b26a645c76d9b738e8787f3cbe29.tar.gz | |
* ext/openssl/lib/openssl/pkey.rb: Added 2048 bit DH parameter.
* test/openssl/test_pkey_dh.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/openssl/pkey.rb | 12 | ||||
| -rw-r--r-- | test/test_pkey_dh.rb | 14 |
2 files changed, 26 insertions, 0 deletions
diff --git a/lib/openssl/pkey.rb b/lib/openssl/pkey.rb index 89563b6..df126fd 100644 --- a/lib/openssl/pkey.rb +++ b/lib/openssl/pkey.rb @@ -11,12 +11,24 @@ AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC -----END DH PARAMETERS----- _end_of_pem_ + + DEFAULT_2048 = new <<-_end_of_pem_ +-----BEGIN DH PARAMETERS----- +MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY +JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab +VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6 +YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3 +1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD +7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg== +-----END DH PARAMETERS----- + _end_of_pem_ end DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen| warn "using default DH parameters." if $VERBOSE case keylen when 1024 then OpenSSL::PKey::DH::DEFAULT_1024 + when 2048 then OpenSSL::PKey::DH::DEFAULT_2048 else nil end diff --git a/test/test_pkey_dh.rb b/test/test_pkey_dh.rb index 0ccb2f2..a0eca53 100644 --- a/test/test_pkey_dh.rb +++ b/test/test_pkey_dh.rb @@ -18,6 +18,20 @@ T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC assert_equal params, OpenSSL::PKey::DH::DEFAULT_1024.to_s end + def test_DEFAULT_2048 + params = <<-eop +-----BEGIN DH PARAMETERS----- +MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY +JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab +VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6 +YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3 +1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD +7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg== +-----END DH PARAMETERS----- + eop + assert_equal params, OpenSSL::PKey::DH::DEFAULT_2048.to_s + end + def test_new dh = OpenSSL::PKey::DH.new(NEW_KEYLEN) assert_key(dh) |