mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
609103dbb5
Import Ruby/OpenSSL 2.1.0.beta1. The full commit log since v2.0.5 (imported by r59567) can be found at: https://github.com/ruby/openssl/compare/v2.0.5...v2.1.0.beta1 ---------------------------------------------------------------- Antonio Terceiro (1): test/test_ssl: explicitly accept TLS 1.1 in corresponding test Colby Swandale (1): document using secure protocol to fetch git master in Bundler Colton Jenkins (1): Add fips_mode_get to return fips_mode Kazuki Yamaguchi (85): Start preparing for 2.1.0 Remove support for OpenSSL 0.9.8 and 1.0.0 bn: refine tests bn: implement unary {plus,minus} operators for OpenSSL::BN bn: implement OpenSSL::BN#negative? Don't define main() when built with --enable-debug test: let OpenSSL::TestCase include OpenSSL::TestUtils test: prepare test PKey instances on demand Add OpenSSL.print_mem_leaks Enable OSSL_MDEBUG on CI builds ssl: move default DH parameters from OpenSSL::PKey::DH Make exceptions with the same format regardless of OpenSSL.debug ssl: show reason of 'certificate verify error' in exception message ssl: remove OpenSSL::ExtConfig::TLS_DH_anon_WITH_AES_256_GCM_SHA384 ssl: do not confuse different ex_data index registries ssl: assume SSL/SSL_CTX always have a valid reference to the Ruby object Fix RDoc markup ssl: suppress compiler warning ext/openssl/deprecation.rb: remove broken-apple-openssl extconf.rb: print informative message if OpenSSL can't be found Rakefile: compile the extension before test kdf: introduce OpenSSL::KDF module ossl.h: add NUM2UINT64T() macro kdf: add scrypt Expand rb_define_copy_func() macro Expand FPTR_TO_FD() macro Remove SafeGet*() macros cipher: rename GetCipherPtr() to ossl_evp_get_cipherbyname() digest: rename GetDigestPtr() to ossl_evp_get_digestbyname() Add ossl_str_new(), an exception-safe rb_str_new() bio: simplify ossl_membio2str() using ossl_str_new() Remove unused functions and macros Drop support for LibreSSL 2.3 ocsp: add OpenSSL::OCSP::Request#signed? asn1: infinite length -> indefinite length asn1: rearrange tests ssl: remove a needless NULL check in SSL::SSLContext#ciphers ssl: return nil in SSL::SSLSocket#cipher if session is not started asn1: remove an unnecessary function prototype asn1: require tag information when instantiating generic type asn1: initialize 'unused_bits' attribute of BitString with 0 asn1: check for illegal 'unused_bits' value of BitString asn1: disallow NULL to be passed to asn1time_to_time() asn1: avoid truncating OID in OpenSSL::ASN1::ObjectId#oid asn1: allow constructed encoding with definite length form asn1: prohibit indefinite length form for primitive encoding asn1: allow tag number to be >= 32 for universal tag class asn1: use ossl_asn1_tag() asn1: clean up OpenSSL::ASN1::Constructive#to_der asn1: harmonize OpenSSL::ASN1::*#to_der asn1: prevent EOC octets from being in the middle of the content asn1: do not treat EOC octets as part of content octets x509name: add 'loc' and 'set' kwargs to OpenSSL::X509::Name#add_entry ssl: do not call session_remove_cb during GC Backport "Merge branch 'topic/test-memory-leak'" to maint cipher: update the documentation for Cipher#auth_tag= Rakefile: let sync:to_ruby know about test/openssl/fixtures test: fix formatting test/utils: remove OpenSSL::TestUtils.silent test/utils: add SSLTestCase#tls12_supported? test/utils: have start_server yield only the port number test/utils: do not set ecdh_curves in start_server test/utils: let server_loop close socket test/utils: improve error handling in start_server test/utils: add OpenSSL::TestUtils.openssl? and .libressl? test/utils: do not use DSA certificates in SSL tests test/test_ssl: remove test_invalid_shutdown_by_gc test/test_ssl: move test_multibyte_read_write to test_pair test/test_ssl_session: rearrange tests test/test_pair, test/test_ssl: fix for TLS 1.3 ssl: remove useless call to rb_thread_wait_fd() ssl: fix NPN support ssl: mark OpenSSL::SSL::SSLContext::DEFAULT_{1024,2048} as private ssl: use 2048-bit group in the default tmp_dh_cb ssl: ensure that SSL option flags are non-negative ssl: update OpenSSL::SSL::OP_* flags ssl: prefer TLS_method() over SSLv23_method() ssl: add SSLContext#min_version= and #max_version= ssl: rework SSLContext#ssl_version= test/test_x509name: change script encoding to ASCII-8BIT x509name: refactor OpenSSL::X509::Name#to_s x509name: add OpenSSL::X509::Name#to_utf8 x509name: add OpenSSL::X509::Name#inspect x509name: update regexp in OpenSSL::X509::Name.parse Ruby/OpenSSL 2.1.0.beta1 Marcus Stollsteimer (1): Fix rdoc for core Integer class nobu (4): [DOC] {read,write}_nonblock with exception: false [DOC] keyword argument _exception_ [DOC] mark up literals Revert r57690 except for read_nonblock git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
121 lines
3.5 KiB
Ruby
121 lines
3.5 KiB
Ruby
# frozen_string_literal: false
|
|
require_relative 'utils'
|
|
|
|
if defined?(OpenSSL)
|
|
|
|
class OpenSSL::TestDigest < OpenSSL::TestCase
|
|
def setup
|
|
super
|
|
@d1 = OpenSSL::Digest.new("MD5")
|
|
@d2 = OpenSSL::Digest::MD5.new
|
|
end
|
|
|
|
def test_digest
|
|
null_hex = "d41d8cd98f00b204e9800998ecf8427e"
|
|
null_bin = [null_hex].pack("H*")
|
|
data = "DATA"
|
|
hex = "e44f9e348e41cb272efa87387728571b"
|
|
bin = [hex].pack("H*")
|
|
assert_equal(null_bin, @d1.digest)
|
|
assert_equal(null_hex, @d1.hexdigest)
|
|
@d1 << data
|
|
assert_equal(bin, @d1.digest)
|
|
assert_equal(hex, @d1.hexdigest)
|
|
assert_equal(bin, OpenSSL::Digest::MD5.digest(data))
|
|
assert_equal(hex, OpenSSL::Digest::MD5.hexdigest(data))
|
|
end
|
|
|
|
def test_eql
|
|
assert(@d1 == @d2, "==")
|
|
d = @d1.clone
|
|
assert(d == @d1, "clone")
|
|
end
|
|
|
|
def test_info
|
|
assert_equal("MD5", @d1.name, "name")
|
|
assert_equal("MD5", @d2.name, "name")
|
|
assert_equal(16, @d1.size, "size")
|
|
end
|
|
|
|
def test_dup
|
|
@d1.update("DATA")
|
|
assert_equal(@d1.name, @d1.dup.name, "dup")
|
|
assert_equal(@d1.name, @d1.clone.name, "clone")
|
|
assert_equal(@d1.digest, @d1.clone.digest, "clone .digest")
|
|
end
|
|
|
|
def test_reset
|
|
@d1.update("DATA")
|
|
dig1 = @d1.digest
|
|
@d1.reset
|
|
@d1.update("DATA")
|
|
dig2 = @d1.digest
|
|
assert_equal(dig1, dig2, "reset")
|
|
end
|
|
|
|
def test_digest_constants
|
|
algs = %w(MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512)
|
|
if !libressl? && !openssl?(1, 1, 0)
|
|
algs += %w(DSS1 SHA)
|
|
end
|
|
algs.each do |alg|
|
|
assert_not_nil(OpenSSL::Digest.new(alg))
|
|
klass = OpenSSL::Digest.const_get(alg)
|
|
assert_not_nil(klass.new)
|
|
end
|
|
end
|
|
|
|
def test_digest_by_oid_and_name
|
|
check_digest(OpenSSL::ASN1::ObjectId.new("MD5"))
|
|
check_digest(OpenSSL::ASN1::ObjectId.new("SHA1"))
|
|
end
|
|
|
|
def encode16(str)
|
|
str.unpack("H*").first
|
|
end
|
|
|
|
def test_sha2
|
|
sha224_a = "abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5"
|
|
sha256_a = "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
|
|
sha384_a = "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31"
|
|
sha512_a = "1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75"
|
|
|
|
assert_equal(sha224_a, OpenSSL::Digest::SHA224.hexdigest("a"))
|
|
assert_equal(sha256_a, OpenSSL::Digest::SHA256.hexdigest("a"))
|
|
assert_equal(sha384_a, OpenSSL::Digest::SHA384.hexdigest("a"))
|
|
assert_equal(sha512_a, OpenSSL::Digest::SHA512.hexdigest("a"))
|
|
|
|
assert_equal(sha224_a, encode16(OpenSSL::Digest::SHA224.digest("a")))
|
|
assert_equal(sha256_a, encode16(OpenSSL::Digest::SHA256.digest("a")))
|
|
assert_equal(sha384_a, encode16(OpenSSL::Digest::SHA384.digest("a")))
|
|
assert_equal(sha512_a, encode16(OpenSSL::Digest::SHA512.digest("a")))
|
|
end
|
|
|
|
def test_digest_by_oid_and_name_sha2
|
|
check_digest(OpenSSL::ASN1::ObjectId.new("SHA224"))
|
|
check_digest(OpenSSL::ASN1::ObjectId.new("SHA256"))
|
|
check_digest(OpenSSL::ASN1::ObjectId.new("SHA384"))
|
|
check_digest(OpenSSL::ASN1::ObjectId.new("SHA512"))
|
|
end
|
|
|
|
def test_openssl_digest
|
|
assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
|
|
|
|
assert_raise NameError do
|
|
OpenSSL::Digest("no such digest")
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def check_digest(oid)
|
|
d = OpenSSL::Digest.new(oid.sn)
|
|
assert_not_nil(d)
|
|
d = OpenSSL::Digest.new(oid.ln)
|
|
assert_not_nil(d)
|
|
d = OpenSSL::Digest.new(oid.oid)
|
|
assert_not_nil(d)
|
|
end
|
|
end
|
|
|
|
end
|