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:
e72d960db2...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
84 lines
2.6 KiB
Ruby
84 lines
2.6 KiB
Ruby
# frozen_string_literal: false
|
|
require_relative "utils"
|
|
|
|
if defined?(OpenSSL)
|
|
|
|
class OpenSSL::TestX509Attribute < OpenSSL::TestCase
|
|
def test_new
|
|
ef = OpenSSL::X509::ExtensionFactory.new
|
|
val = OpenSSL::ASN1::Set.new([OpenSSL::ASN1::Sequence.new([
|
|
ef.create_extension("keyUsage", "keyCertSign", true)
|
|
])])
|
|
attr = OpenSSL::X509::Attribute.new("extReq", val)
|
|
assert_equal("extReq", attr.oid)
|
|
assert_equal(val.to_der, attr.value.to_der)
|
|
|
|
attr = OpenSSL::X509::Attribute.new("1.2.840.113549.1.9.14", val)
|
|
assert_equal("extReq", attr.oid)
|
|
end
|
|
|
|
def test_from_der
|
|
# oid: challengePassword, values: Set[UTF8String<"abc123">]
|
|
test_der = "\x30\x15\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x09\x07\x31\x08" \
|
|
"\x0c\x06\x61\x62\x63\x31\x32\x33".b
|
|
attr = OpenSSL::X509::Attribute.new(test_der)
|
|
assert_equal(test_der, attr.to_der)
|
|
assert_equal("challengePassword", attr.oid)
|
|
assert_equal("abc123", attr.value.value[0].value)
|
|
end
|
|
|
|
def test_to_der
|
|
ef = OpenSSL::X509::ExtensionFactory.new
|
|
val = OpenSSL::ASN1::Set.new([OpenSSL::ASN1::Sequence.new([
|
|
ef.create_extension("keyUsage", "keyCertSign", true)
|
|
])])
|
|
attr = OpenSSL::X509::Attribute.new("extReq", val)
|
|
expected = OpenSSL::ASN1::Sequence.new([
|
|
OpenSSL::ASN1::ObjectId.new("extReq"),
|
|
val
|
|
])
|
|
assert_equal(expected.to_der, attr.to_der)
|
|
end
|
|
|
|
def test_invalid_value
|
|
# should not change the original value
|
|
test_der = "\x30\x15\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x09\x07\x31\x08" \
|
|
"\x0c\x06\x61\x62\x63\x31\x32\x33".b
|
|
attr = OpenSSL::X509::Attribute.new(test_der)
|
|
assert_raise(TypeError) {
|
|
attr.value = "1234"
|
|
}
|
|
assert_equal(test_der, attr.to_der)
|
|
assert_raise(OpenSSL::X509::AttributeError) {
|
|
attr.oid = "abc123"
|
|
}
|
|
assert_equal(test_der, attr.to_der)
|
|
end
|
|
|
|
def test_dup
|
|
val = OpenSSL::ASN1::Set([
|
|
OpenSSL::ASN1::UTF8String("abc123")
|
|
])
|
|
attr = OpenSSL::X509::Attribute.new("challengePassword", val)
|
|
assert_equal(attr.to_der, attr.dup.to_der)
|
|
end
|
|
|
|
def test_eq
|
|
val1 = OpenSSL::ASN1::Set([
|
|
OpenSSL::ASN1::UTF8String("abc123")
|
|
])
|
|
attr1 = OpenSSL::X509::Attribute.new("challengePassword", val1)
|
|
attr2 = OpenSSL::X509::Attribute.new("challengePassword", val1)
|
|
ef = OpenSSL::X509::ExtensionFactory.new
|
|
val2 = OpenSSL::ASN1::Set.new([OpenSSL::ASN1::Sequence.new([
|
|
ef.create_extension("keyUsage", "keyCertSign", true)
|
|
])])
|
|
attr3 = OpenSSL::X509::Attribute.new("extReq", val2)
|
|
|
|
assert_equal false, attr1 == 12345
|
|
assert_equal true, attr1 == attr2
|
|
assert_equal false, attr1 == attr3
|
|
end
|
|
end
|
|
|
|
end
|