diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-03 17:57:57 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-03 17:57:57 +0000 |
| commit | 0b5e532ed3ee329757f5ca6a052d9ffe46e2e650 (patch) | |
| tree | fd9c35512f3dac1f6aa399e515528255f6e55439 /test/openssl | |
| parent | 15ce6732bd66d57af3ad8a5bdde0701dd57ab068 (diff) | |
merge revision(s) 53718: [Backport #12320]
Skip SHA from test_digest_constants for LibreSSL 2.3
The first one of ruby/openssl#40
https://github.com/ruby/openssl/issues/40#issuecomment-159839338
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
| -rw-r--r-- | test/openssl/test_digest.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb index e206ca0283..8b724a03a9 100644 --- a/test/openssl/test_digest.rb +++ b/test/openssl/test_digest.rb @@ -58,7 +58,10 @@ class OpenSSL::TestDigest < Test::Unit::TestCase end def test_digest_constants - algs = %w(DSS1 MD4 MD5 RIPEMD160 SHA SHA1) + algs = %w(DSS1 MD4 MD5 RIPEMD160 SHA1) + if !libressl? || !version_since([2,3]) + algs += %w(SHA) + end if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000 algs += %w(SHA224 SHA256 SHA384 SHA512) end @@ -122,6 +125,14 @@ class OpenSSL::TestDigest < Test::Unit::TestCase d = OpenSSL::Digest.new(oid.oid) assert_not_nil(d) end + + def libressl? + OpenSSL::OPENSSL_VERSION.include?('LibreSSL') + end + + def version_since(verary) + (OpenSSL::OPENSSL_LIBRARY_VERSION.scan(/\d+/).map(&:to_i) <=> verary) != -1 + end end end |