diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-03 03:22:22 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-03 03:22:22 +0000 |
| commit | a4ce3ab4fd5982af49662320839f8ec109d63881 (patch) | |
| tree | c6c164eac26fb14ff394da9023091550f7d66a81 | |
| parent | c5ad3214391630a096db03decf8cb15f7046a7fd (diff) | |
remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl.c | 2 | ||||
| -rw-r--r-- | test/openssl/utils.rb | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -9,11 +9,11 @@ Mon Sep 3 10:09:36 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> test/openssl/utils.rb: Replace DSS1 as certificate signature digest with SHA1 for FIPS installations when using DSA by introducing TestUtils::DSA_SIGNATURE_DIGEST. - test/openssl/test_x509cert.rb: + test/openssl/test_x509cert.rb: test/openssl/test_x509crl.rb: test/openssl/test_x509req.rb: Use DSA_SIGNATURE_DIGEST NEWS: Introduce OpenSSL::OPENSSL_FIPS - + These changes allow running the OpenSSL tests in FIPS mode while keeping a high performance for non-FIPS installations. Introduction of OpenSSL::OPENSSL_FIPS allows for applications @@ -171,7 +171,7 @@ with all sufficient information, see the ChangeLog file. OpenSSL::PKey::EC therefore now enforce the same check when exporting a private key to PEM with a password - it has to be at least four characters long. - * SSL/TLS support for the Next Protocol Negotiation extension. Supported + * SSL/TLS support for the Next Protocol Negotiation extension. Supported with OpenSSL 1.0.1 and higher. * OpenSSL::OPENSSL_FIPS allows client applications to detect whether OpenSSL is running in FIPS mode and to react to the special requirements this diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index ebd2b5d13a..989e91417d 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -944,7 +944,7 @@ Init_openssl() rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER)); /* - * Boolean indicating whether OpenSSL runs in FIPS mode or not + * Boolean indicating whether OpenSSL runs in FIPS mode or not */ #ifdef HAVE_OPENSSL_FIPS rb_define_const(mOSSL, "OPENSSL_FIPS", Qtrue); diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index ae33aa998c..241cda83aa 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_FIPS ? OpenSSL::Digest::SHA1 : OpenSSL::Digest::DSS1 |