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
241 lines
9.6 KiB
Ruby
241 lines
9.6 KiB
Ruby
# frozen_string_literal: false
|
|
require_relative "utils"
|
|
|
|
if defined?(OpenSSL)
|
|
|
|
class OpenSSL::TestX509Store < OpenSSL::TestCase
|
|
def setup
|
|
super
|
|
@rsa1024 = Fixtures.pkey("rsa1024")
|
|
@rsa2048 = Fixtures.pkey("rsa2048")
|
|
@dsa256 = Fixtures.pkey("dsa256")
|
|
@dsa512 = Fixtures.pkey("dsa512")
|
|
@ca1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA1")
|
|
@ca2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA2")
|
|
@ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
|
|
@ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
|
|
end
|
|
|
|
def test_nosegv_on_cleanup
|
|
cert = OpenSSL::X509::Certificate.new
|
|
store = OpenSSL::X509::Store.new
|
|
ctx = OpenSSL::X509::StoreContext.new(store, cert, [])
|
|
EnvUtil.suppress_warning do
|
|
ctx.cleanup
|
|
end
|
|
ctx.verify
|
|
end
|
|
|
|
def test_add_file
|
|
ca_exts = [
|
|
["basicConstraints", "CA:TRUE", true],
|
|
["keyUsage", "cRLSign,keyCertSign", true],
|
|
]
|
|
cert1 = issue_cert(@ca1, @rsa1024, 1, ca_exts, nil, nil)
|
|
cert2 = issue_cert(@ca2, @rsa2048, 1, ca_exts, nil, nil)
|
|
tmpfile = Tempfile.open { |f| f << cert1.to_pem << cert2.to_pem; f }
|
|
|
|
store = OpenSSL::X509::Store.new
|
|
assert_equal false, store.verify(cert1)
|
|
assert_equal false, store.verify(cert2)
|
|
store.add_file(tmpfile.path)
|
|
assert_equal true, store.verify(cert1)
|
|
assert_equal true, store.verify(cert2)
|
|
|
|
# OpenSSL < 1.1.1 leaks an error on a duplicate certificate
|
|
assert_nothing_raised { store.add_file(tmpfile.path) }
|
|
assert_equal [], OpenSSL.errors
|
|
ensure
|
|
tmpfile and tmpfile.close!
|
|
end
|
|
|
|
def test_verify
|
|
# OpenSSL uses time(2) while Time.now uses clock_gettime(CLOCK_REALTIME),
|
|
# and there may be difference.
|
|
now = Time.now - 3
|
|
ca_exts = [
|
|
["basicConstraints","CA:TRUE",true],
|
|
["keyUsage","cRLSign,keyCertSign",true],
|
|
]
|
|
ee_exts = [
|
|
["keyUsage","keyEncipherment,digitalSignature",true],
|
|
]
|
|
ca1_cert = issue_cert(@ca1, @rsa2048, 1, ca_exts, nil, nil)
|
|
ca2_cert = issue_cert(@ca2, @rsa1024, 2, ca_exts, ca1_cert, @rsa2048,
|
|
not_after: now+1800)
|
|
ee1_cert = issue_cert(@ee1, @dsa256, 10, ee_exts, ca2_cert, @rsa1024)
|
|
ee2_cert = issue_cert(@ee2, @dsa512, 20, ee_exts, ca2_cert, @rsa1024)
|
|
ee3_cert = issue_cert(@ee2, @dsa512, 30, ee_exts, ca2_cert, @rsa1024,
|
|
not_before: now-100, not_after: now-1)
|
|
ee4_cert = issue_cert(@ee2, @dsa512, 40, ee_exts, ca2_cert, @rsa1024,
|
|
not_before: now+1000, not_after: now+2000,)
|
|
|
|
revoke_info = []
|
|
crl1 = issue_crl(revoke_info, 1, now, now+1800, [],
|
|
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
revoke_info = [ [2, now, 1], ]
|
|
crl1_2 = issue_crl(revoke_info, 2, now, now+1800, [],
|
|
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
revoke_info = [ [20, now, 1], ]
|
|
crl2 = issue_crl(revoke_info, 1, now, now+1800, [],
|
|
ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
|
|
revoke_info = []
|
|
crl2_2 = issue_crl(revoke_info, 2, now-100, now-1, [],
|
|
ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
|
|
|
|
assert_equal(true, ca1_cert.verify(ca1_cert.public_key)) # self signed
|
|
assert_equal(true, ca2_cert.verify(ca1_cert.public_key)) # issued by ca1
|
|
assert_equal(true, ee1_cert.verify(ca2_cert.public_key)) # issued by ca2
|
|
assert_equal(true, ee2_cert.verify(ca2_cert.public_key)) # issued by ca2
|
|
assert_equal(true, ee3_cert.verify(ca2_cert.public_key)) # issued by ca2
|
|
assert_equal(true, crl1.verify(ca1_cert.public_key)) # issued by ca1
|
|
assert_equal(true, crl1_2.verify(ca1_cert.public_key)) # issued by ca1
|
|
assert_equal(true, crl2.verify(ca2_cert.public_key)) # issued by ca2
|
|
assert_equal(true, crl2_2.verify(ca2_cert.public_key)) # issued by ca2
|
|
|
|
store = OpenSSL::X509::Store.new
|
|
assert_equal(false, store.verify(ca1_cert))
|
|
assert_not_equal(OpenSSL::X509::V_OK, store.error)
|
|
|
|
assert_equal(false, store.verify(ca2_cert))
|
|
assert_not_equal(OpenSSL::X509::V_OK, store.error)
|
|
|
|
store.add_cert(ca1_cert)
|
|
assert_equal(true, store.verify(ca2_cert))
|
|
assert_equal(OpenSSL::X509::V_OK, store.error)
|
|
assert_equal("ok", store.error_string)
|
|
chain = store.chain
|
|
assert_equal(2, chain.size)
|
|
assert_equal(@ca2.to_der, chain[0].subject.to_der)
|
|
assert_equal(@ca1.to_der, chain[1].subject.to_der)
|
|
|
|
store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
|
|
assert_equal(false, store.verify(ca2_cert))
|
|
assert_not_equal(OpenSSL::X509::V_OK, store.error)
|
|
|
|
store.purpose = OpenSSL::X509::PURPOSE_CRL_SIGN
|
|
assert_equal(true, store.verify(ca2_cert))
|
|
assert_equal(OpenSSL::X509::V_OK, store.error)
|
|
|
|
store.add_cert(ca2_cert)
|
|
store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
|
|
assert_equal(true, store.verify(ee1_cert))
|
|
assert_equal(true, store.verify(ee2_cert))
|
|
assert_equal(OpenSSL::X509::V_OK, store.error)
|
|
assert_equal("ok", store.error_string)
|
|
chain = store.chain
|
|
assert_equal(3, chain.size)
|
|
assert_equal(@ee2.to_der, chain[0].subject.to_der)
|
|
assert_equal(@ca2.to_der, chain[1].subject.to_der)
|
|
assert_equal(@ca1.to_der, chain[2].subject.to_der)
|
|
assert_equal(false, store.verify(ee3_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
|
|
assert_match(/expire/i, store.error_string)
|
|
assert_equal(false, store.verify(ee4_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID, store.error)
|
|
assert_match(/not yet valid/i, store.error_string)
|
|
|
|
store = OpenSSL::X509::Store.new
|
|
store.add_cert(ca1_cert)
|
|
store.add_cert(ca2_cert)
|
|
store.time = now + 1500
|
|
assert_equal(true, store.verify(ca1_cert))
|
|
assert_equal(true, store.verify(ca2_cert))
|
|
assert_equal(true, store.verify(ee4_cert))
|
|
store.time = now + 1900
|
|
assert_equal(true, store.verify(ca1_cert))
|
|
assert_equal(false, store.verify(ca2_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
|
|
assert_equal(false, store.verify(ee4_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
|
|
store.time = now + 4000
|
|
assert_equal(false, store.verify(ee1_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
|
|
assert_equal(false, store.verify(ee4_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
|
|
|
|
# the underlying X509 struct caches the result of the last
|
|
# verification for signature and not-before. so the following code
|
|
# rebuilds new objects to avoid site effect.
|
|
store.time = Time.now - 4000
|
|
assert_equal(false, store.verify(OpenSSL::X509::Certificate.new(ca2_cert)))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID, store.error)
|
|
assert_equal(false, store.verify(OpenSSL::X509::Certificate.new(ee1_cert)))
|
|
assert_equal(OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID, store.error)
|
|
|
|
store = OpenSSL::X509::Store.new
|
|
store.purpose = OpenSSL::X509::PURPOSE_ANY
|
|
store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK
|
|
store.add_cert(ca1_cert)
|
|
store.add_crl(crl1) # revoke no cert
|
|
store.add_crl(crl2) # revoke ee2_cert
|
|
assert_equal(true, store.verify(ca1_cert))
|
|
assert_equal(true, store.verify(ca2_cert))
|
|
assert_equal(true, store.verify(ee1_cert, [ca2_cert]))
|
|
assert_equal(false, store.verify(ee2_cert, [ca2_cert]))
|
|
|
|
store = OpenSSL::X509::Store.new
|
|
store.purpose = OpenSSL::X509::PURPOSE_ANY
|
|
store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK
|
|
store.add_cert(ca1_cert)
|
|
store.add_crl(crl1_2) # revoke ca2_cert
|
|
store.add_crl(crl2) # revoke ee2_cert
|
|
assert_equal(true, store.verify(ca1_cert))
|
|
assert_equal(false, store.verify(ca2_cert))
|
|
assert_equal(true, store.verify(ee1_cert, [ca2_cert]),
|
|
"This test is expected to be success with OpenSSL 0.9.7c or later.")
|
|
assert_equal(false, store.verify(ee2_cert, [ca2_cert]))
|
|
|
|
store.flags =
|
|
OpenSSL::X509::V_FLAG_CRL_CHECK|OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
|
|
assert_equal(true, store.verify(ca1_cert))
|
|
assert_equal(false, store.verify(ca2_cert))
|
|
assert_equal(false, store.verify(ee1_cert, [ca2_cert]))
|
|
assert_equal(false, store.verify(ee2_cert, [ca2_cert]))
|
|
|
|
store = OpenSSL::X509::Store.new
|
|
store.purpose = OpenSSL::X509::PURPOSE_ANY
|
|
store.flags =
|
|
OpenSSL::X509::V_FLAG_CRL_CHECK|OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
|
|
store.add_cert(ca1_cert)
|
|
store.add_cert(ca2_cert)
|
|
store.add_crl(crl1)
|
|
store.add_crl(crl2_2) # issued by ca2 but expired.
|
|
assert_equal(true, store.verify(ca1_cert))
|
|
assert_equal(true, store.verify(ca2_cert))
|
|
assert_equal(false, store.verify(ee1_cert))
|
|
assert_equal(OpenSSL::X509::V_ERR_CRL_HAS_EXPIRED, store.error)
|
|
assert_equal(false, store.verify(ee2_cert))
|
|
end
|
|
|
|
def test_set_errors
|
|
return if openssl?(1, 1, 0) || libressl?
|
|
now = Time.now
|
|
ca1_cert = issue_cert(@ca1, @rsa2048, 1, [], nil, nil)
|
|
store = OpenSSL::X509::Store.new
|
|
store.add_cert(ca1_cert)
|
|
assert_raise(OpenSSL::X509::StoreError){
|
|
store.add_cert(ca1_cert) # add same certificate twice
|
|
}
|
|
|
|
revoke_info = []
|
|
crl1 = issue_crl(revoke_info, 1, now, now+1800, [],
|
|
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
revoke_info = [ [2, now, 1], ]
|
|
crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [],
|
|
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
store.add_crl(crl1)
|
|
assert_raise(OpenSSL::X509::StoreError){
|
|
store.add_crl(crl2) # add CRL issued by same CA twice.
|
|
}
|
|
end
|
|
|
|
def test_dup
|
|
store = OpenSSL::X509::Store.new
|
|
assert_raise(NoMethodError) { store.dup }
|
|
ctx = OpenSSL::X509::StoreContext.new(store)
|
|
assert_raise(NoMethodError) { ctx.dup }
|
|
end
|
|
end
|
|
|
|
end
|