diff options
| author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-03 22:09:33 +0000 |
|---|---|---|
| committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-03 22:09:33 +0000 |
| commit | 78755b8d52101e3b85ebce3aedd97e4cce8ed6ad (patch) | |
| tree | 3d5c28855ae94760bbfc844262fac5fd1cba2c50 | |
| parent | 2000173101bfa2a5beadca8d9c77b991354d30e8 (diff) | |
| download | ruby-78755b8d52101e3b85ebce3aedd97e4cce8ed6ad.tar.gz | |
* test/openssl/utils.rb: Use DSS1 as DSA signature digest for all
OpenSSL versions < 1.0.0.
[ruby-core:47405]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/openssl/utils.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Sep 4 07:02:56 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * test/openssl/utils.rb: Use DSS1 as DSA signature digest for all + OpenSSL versions < 1.0.0. + [ruby-core:47405] + Mon Sep 3 21:22:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/ruby.h (rb_float_value): suppress warnings. diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index 241cda83aa..103e1e7eff 100644 --- a/test/openssl/utils.rb +++ b/test/openssl/utils.rb @@ -109,7 +109,7 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC TEST_KEY_DH1024.priv_key = OpenSSL::BN.new("48561834C67E65FFD2A9B47F41E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB451E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672EEF3EF13AB47A15275FC2836F3AC74CEA", 16) - DSA_SIGNATURE_DIGEST = OpenSSL::OPENSSL_FIPS ? + DSA_SIGNATURE_DIGEST = OpenSSL::OPENSSL_VERSION_NUMBER > 0x10000000 ? OpenSSL::Digest::SHA1 : OpenSSL::Digest::DSS1 |