mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
a55320b093
Import Ruby/OpenSSL 2.1.0.beta2. The full commit log since commit e72d960db262 which was imported by r60013 can be found at: https://github.com/ruby/openssl/compare/e72d960db262...v2.1.0.beta2 ---------------------------------------------------------------- Kazuki Yamaguchi (26): bn: use ALLOCV() macro instead of xmalloc() appveyor.yml: remove 'openssl version' line test/test_ssl_session: skip tests for session_remove_cb x509ext: implement X509::Extension#== x509attr: implement X509::Attribute#== x509cert: implement X509::Certificate#== x509revoked: add missing X509::Revoked#to_der x509crl, x509revoked: implement X509::{CRL,Revoked}#== x509req: implement X509::Request#== ssl: extract rb_intern("call") cipher: disallow setting AAD for non-AEAD ciphers test/test_cipher: fix test_non_aead_cipher_set_auth_data failure ssl: fix conflict of options in SSLContext#set_params buffering: let #write accept multiple arguments pkey: make pkey_check_public_key() non-static x509cert, x509crl, x509req, ns_spki: check sanity of public key test/envutil: port assert_warning from Ruby trunk test/utils: remove a pointless .public_key call in issue_cert ssl: add SSLContext#add_certificate test/test_ssl: fix test_security_level Drop support for LibreSSL 2.4 kdf: add HKDF support test/test_x509cert: fix flaky test test/test_x509crl: fix random failure History.md: fix a typo Ruby/OpenSSL 2.1.0.beta2 Mark Wright (1): Fix build failure against OpenSSL 1.1 built with no-deprecated Thanks rhenium for the code review and fixes. Peter Karman (1): Add RSA sign_pss() and verify_pss() methods aeris (1): TLS Fallback Signaling Cipher Suite Value kazu (1): Use caller with length to reduce unused strings git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
261 lines
9.2 KiB
Ruby
261 lines
9.2 KiB
Ruby
# frozen_string_literal: false
|
|
require_relative "utils"
|
|
|
|
if defined?(OpenSSL)
|
|
|
|
class OpenSSL::TestX509CRL < OpenSSL::TestCase
|
|
def setup
|
|
super
|
|
@rsa1024 = Fixtures.pkey("rsa1024")
|
|
@rsa2048 = Fixtures.pkey("rsa2048")
|
|
@dsa256 = Fixtures.pkey("dsa256")
|
|
@dsa512 = Fixtures.pkey("dsa512")
|
|
@ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
|
|
@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_basic
|
|
now = Time.at(Time.now.to_i)
|
|
|
|
cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
|
|
crl = issue_crl([], 1, now, now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
assert_equal(1, crl.version)
|
|
assert_equal(cert.issuer.to_der, crl.issuer.to_der)
|
|
assert_equal(now, crl.last_update)
|
|
assert_equal(now+1600, crl.next_update)
|
|
|
|
crl = OpenSSL::X509::CRL.new(crl.to_der)
|
|
assert_equal(1, crl.version)
|
|
assert_equal(cert.issuer.to_der, crl.issuer.to_der)
|
|
assert_equal(now, crl.last_update)
|
|
assert_equal(now+1600, crl.next_update)
|
|
end
|
|
|
|
def test_revoked
|
|
|
|
# CRLReason ::= ENUMERATED {
|
|
# unspecified (0),
|
|
# keyCompromise (1),
|
|
# cACompromise (2),
|
|
# affiliationChanged (3),
|
|
# superseded (4),
|
|
# cessationOfOperation (5),
|
|
# certificateHold (6),
|
|
# removeFromCRL (8),
|
|
# privilegeWithdrawn (9),
|
|
# aACompromise (10) }
|
|
|
|
now = Time.at(Time.now.to_i)
|
|
revoke_info = [
|
|
[1, Time.at(0), 1],
|
|
[2, Time.at(0x7fffffff), 2],
|
|
[3, now, 3],
|
|
[4, now, 4],
|
|
[5, now, 5],
|
|
]
|
|
cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
|
|
crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
revoked = crl.revoked
|
|
assert_equal(5, revoked.size)
|
|
assert_equal(1, revoked[0].serial)
|
|
assert_equal(2, revoked[1].serial)
|
|
assert_equal(3, revoked[2].serial)
|
|
assert_equal(4, revoked[3].serial)
|
|
assert_equal(5, revoked[4].serial)
|
|
|
|
assert_equal(Time.at(0), revoked[0].time)
|
|
assert_equal(Time.at(0x7fffffff), revoked[1].time)
|
|
assert_equal(now, revoked[2].time)
|
|
assert_equal(now, revoked[3].time)
|
|
assert_equal(now, revoked[4].time)
|
|
|
|
assert_equal("CRLReason", revoked[0].extensions[0].oid)
|
|
assert_equal("CRLReason", revoked[1].extensions[0].oid)
|
|
assert_equal("CRLReason", revoked[2].extensions[0].oid)
|
|
assert_equal("CRLReason", revoked[3].extensions[0].oid)
|
|
assert_equal("CRLReason", revoked[4].extensions[0].oid)
|
|
|
|
assert_equal("Key Compromise", revoked[0].extensions[0].value)
|
|
assert_equal("CA Compromise", revoked[1].extensions[0].value)
|
|
assert_equal("Affiliation Changed", revoked[2].extensions[0].value)
|
|
assert_equal("Superseded", revoked[3].extensions[0].value)
|
|
assert_equal("Cessation Of Operation", revoked[4].extensions[0].value)
|
|
|
|
assert_equal(false, revoked[0].extensions[0].critical?)
|
|
assert_equal(false, revoked[1].extensions[0].critical?)
|
|
assert_equal(false, revoked[2].extensions[0].critical?)
|
|
assert_equal(false, revoked[3].extensions[0].critical?)
|
|
assert_equal(false, revoked[4].extensions[0].critical?)
|
|
|
|
assert_equal("Key Compromise", revoked[0].extensions[0].value)
|
|
assert_equal("CA Compromise", revoked[1].extensions[0].value)
|
|
assert_equal("Affiliation Changed", revoked[2].extensions[0].value)
|
|
assert_equal("Superseded", revoked[3].extensions[0].value)
|
|
assert_equal("Cessation Of Operation", revoked[4].extensions[0].value)
|
|
|
|
revoke_info = (1..1000).collect{|i| [i, now, 0] }
|
|
crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
revoked = crl.revoked
|
|
assert_equal(1000, revoked.size)
|
|
assert_equal(1, revoked[0].serial)
|
|
assert_equal(1000, revoked[999].serial)
|
|
|
|
crl.revoked = revoked
|
|
revoked2 = crl.revoked
|
|
assert_equal(revoked.map(&:serial), revoked2.map(&:serial))
|
|
end
|
|
|
|
def test_extension
|
|
cert_exts = [
|
|
["basicConstraints", "CA:TRUE", true],
|
|
["subjectKeyIdentifier", "hash", false],
|
|
["authorityKeyIdentifier", "keyid:always", false],
|
|
["subjectAltName", "email:xyzzy@ruby-lang.org", false],
|
|
["keyUsage", "cRLSign, keyCertSign", true],
|
|
]
|
|
crl_exts = [
|
|
["authorityKeyIdentifier", "keyid:always", false],
|
|
["issuerAltName", "issuer:copy", false],
|
|
]
|
|
|
|
cert = issue_cert(@ca, @rsa2048, 1, cert_exts, nil, nil)
|
|
crl = issue_crl([], 1, Time.now, Time.now+1600, crl_exts,
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
exts = crl.extensions
|
|
assert_equal(3, exts.size)
|
|
assert_equal("1", exts[0].value)
|
|
assert_equal("crlNumber", exts[0].oid)
|
|
assert_equal(false, exts[0].critical?)
|
|
|
|
assert_equal("authorityKeyIdentifier", exts[1].oid)
|
|
keyid = OpenSSL::TestUtils.get_subject_key_id(cert)
|
|
assert_match(/^keyid:#{keyid}/, exts[1].value)
|
|
assert_equal(false, exts[1].critical?)
|
|
|
|
assert_equal("issuerAltName", exts[2].oid)
|
|
assert_equal("email:xyzzy@ruby-lang.org", exts[2].value)
|
|
assert_equal(false, exts[2].critical?)
|
|
|
|
crl = OpenSSL::X509::CRL.new(crl.to_der)
|
|
exts = crl.extensions
|
|
assert_equal(3, exts.size)
|
|
assert_equal("1", exts[0].value)
|
|
assert_equal("crlNumber", exts[0].oid)
|
|
assert_equal(false, exts[0].critical?)
|
|
|
|
assert_equal("authorityKeyIdentifier", exts[1].oid)
|
|
keyid = OpenSSL::TestUtils.get_subject_key_id(cert)
|
|
assert_match(/^keyid:#{keyid}/, exts[1].value)
|
|
assert_equal(false, exts[1].critical?)
|
|
|
|
assert_equal("issuerAltName", exts[2].oid)
|
|
assert_equal("email:xyzzy@ruby-lang.org", exts[2].value)
|
|
assert_equal(false, exts[2].critical?)
|
|
end
|
|
|
|
def test_crlnumber
|
|
cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
|
|
crl = issue_crl([], 1, Time.now, Time.now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
assert_match(1.to_s, crl.extensions[0].value)
|
|
assert_match(/X509v3 CRL Number:\s+#{1}/m, crl.to_text)
|
|
|
|
crl = issue_crl([], 2**32, Time.now, Time.now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
assert_match((2**32).to_s, crl.extensions[0].value)
|
|
assert_match(/X509v3 CRL Number:\s+#{2**32}/m, crl.to_text)
|
|
|
|
crl = issue_crl([], 2**100, Time.now, Time.now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
assert_match(/X509v3 CRL Number:\s+#{2**100}/m, crl.to_text)
|
|
assert_match((2**100).to_s, crl.extensions[0].value)
|
|
end
|
|
|
|
def test_sign_and_verify
|
|
cert = issue_cert(@ca, @rsa2048, 1, [], nil, nil)
|
|
crl = issue_crl([], 1, Time.now, Time.now+1600, [],
|
|
cert, @rsa2048, OpenSSL::Digest::SHA1.new)
|
|
assert_equal(false, crl.verify(@rsa1024))
|
|
assert_equal(true, crl.verify(@rsa2048))
|
|
assert_equal(false, crl_error_returns_false { crl.verify(@dsa256) })
|
|
assert_equal(false, crl_error_returns_false { crl.verify(@dsa512) })
|
|
crl.version = 0
|
|
assert_equal(false, crl.verify(@rsa2048))
|
|
|
|
cert = issue_cert(@ca, @dsa512, 1, [], nil, nil)
|
|
crl = issue_crl([], 1, Time.now, Time.now+1600, [],
|
|
cert, @dsa512, OpenSSL::Digest::SHA1.new)
|
|
assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
|
|
assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
|
|
assert_equal(false, crl.verify(@dsa256))
|
|
assert_equal(true, crl.verify(@dsa512))
|
|
crl.version = 0
|
|
assert_equal(false, crl.verify(@dsa512))
|
|
end
|
|
|
|
def test_revoked_to_der
|
|
# revokedCertificates SEQUENCE OF SEQUENCE {
|
|
# userCertificate CertificateSerialNumber,
|
|
# revocationDate Time,
|
|
# crlEntryExtensions Extensions OPTIONAL
|
|
# -- if present, version MUST be v2
|
|
# } OPTIONAL,
|
|
|
|
now = Time.utc(2000, 1, 1)
|
|
rev1 = OpenSSL::X509::Revoked.new
|
|
rev1.serial = 123
|
|
rev1.time = now
|
|
ext = OpenSSL::X509::Extension.new("CRLReason", OpenSSL::ASN1::Enumerated(1))
|
|
rev1.extensions = [ext]
|
|
asn1 = OpenSSL::ASN1::Sequence([
|
|
OpenSSL::ASN1::Integer(123),
|
|
OpenSSL::ASN1::UTCTime(now),
|
|
OpenSSL::ASN1::Sequence([ext.to_der])
|
|
])
|
|
|
|
assert_equal asn1.to_der, rev1.to_der
|
|
end
|
|
|
|
def test_eq
|
|
now = Time.now
|
|
|
|
cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil)
|
|
crl1 = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1024, "sha256")
|
|
rev1 = OpenSSL::X509::Revoked.new.tap { |rev|
|
|
rev.serial = 1
|
|
rev.time = now
|
|
}
|
|
crl1.add_revoked(rev1)
|
|
crl2 = OpenSSL::X509::CRL.new(crl1.to_der)
|
|
|
|
# CRL
|
|
assert_equal false, crl1 == 12345
|
|
assert_equal true, crl1 == crl2
|
|
rev2 = OpenSSL::X509::Revoked.new.tap { |rev|
|
|
rev.serial = 2
|
|
rev.time = now
|
|
}
|
|
crl2.add_revoked(rev2)
|
|
assert_equal false, crl1 == crl2
|
|
|
|
# Revoked
|
|
assert_equal false, rev1 == 12345
|
|
assert_equal true, rev1 == crl2.revoked[0]
|
|
assert_equal false, rev1 == crl2.revoked[1]
|
|
assert_equal true, rev2 == crl2.revoked[1]
|
|
end
|
|
|
|
private
|
|
|
|
def crl_error_returns_false
|
|
yield
|
|
rescue OpenSSL::X509::CRLError
|
|
false
|
|
end
|
|
end
|
|
|
|
end
|