mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 16:44:01 +02:00

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
182 lines
5.2 KiB
Ruby
182 lines
5.2 KiB
Ruby
# frozen_string_literal: false
|
|
#--
|
|
# = Ruby-space definitions that completes C-space funcs for X509 and subclasses
|
|
#
|
|
# = Info
|
|
# 'OpenSSL for Ruby 2' project
|
|
# Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
# All rights reserved.
|
|
#
|
|
# = Licence
|
|
# This program is licensed under the same licence as Ruby.
|
|
# (See the file 'LICENCE'.)
|
|
#++
|
|
|
|
module OpenSSL
|
|
module X509
|
|
class ExtensionFactory
|
|
def create_extension(*arg)
|
|
if arg.size > 1
|
|
create_ext(*arg)
|
|
else
|
|
send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
|
|
end
|
|
end
|
|
|
|
def create_ext_from_array(ary)
|
|
raise ExtensionError, "unexpected array form" if ary.size > 3
|
|
create_ext(ary[0], ary[1], ary[2])
|
|
end
|
|
|
|
def create_ext_from_string(str) # "oid = critical, value"
|
|
oid, value = str.split(/=/, 2)
|
|
oid.strip!
|
|
value.strip!
|
|
create_ext(oid, value)
|
|
end
|
|
|
|
def create_ext_from_hash(hash)
|
|
create_ext(hash["oid"], hash["value"], hash["critical"])
|
|
end
|
|
end
|
|
|
|
class Extension
|
|
def to_s # "oid = critical, value"
|
|
str = self.oid
|
|
str << " = "
|
|
str << "critical, " if self.critical?
|
|
str << self.value.gsub(/\n/, ", ")
|
|
end
|
|
|
|
def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
|
|
{"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
|
|
end
|
|
|
|
def to_a
|
|
[ self.oid, self.value, self.critical? ]
|
|
end
|
|
end
|
|
|
|
class Name
|
|
module RFC2253DN
|
|
Special = ',=+<>#;'
|
|
HexChar = /[0-9a-fA-F]/
|
|
HexPair = /#{HexChar}#{HexChar}/
|
|
HexString = /#{HexPair}+/
|
|
Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
|
|
StringChar = /[^\\"#{Special}]/
|
|
QuoteChar = /[^\\"]/
|
|
AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
|
|
AttributeValue = /
|
|
(?!["#])((?:#{StringChar}|#{Pair})*)|
|
|
\#(#{HexString})|
|
|
"((?:#{QuoteChar}|#{Pair})*)"
|
|
/x
|
|
TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
|
|
|
|
module_function
|
|
|
|
def expand_pair(str)
|
|
return nil unless str
|
|
return str.gsub(Pair){
|
|
pair = $&
|
|
case pair.size
|
|
when 2 then pair[1,1]
|
|
when 3 then Integer("0x#{pair[1,2]}").chr
|
|
else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
|
|
end
|
|
}
|
|
end
|
|
|
|
def expand_hexstring(str)
|
|
return nil unless str
|
|
der = str.gsub(HexPair){$&.to_i(16).chr }
|
|
a1 = OpenSSL::ASN1.decode(der)
|
|
return a1.value, a1.tag
|
|
end
|
|
|
|
def expand_value(str1, str2, str3)
|
|
value = expand_pair(str1)
|
|
value, tag = expand_hexstring(str2) unless value
|
|
value = expand_pair(str3) unless value
|
|
return value, tag
|
|
end
|
|
|
|
def scan(dn)
|
|
str = dn
|
|
ary = []
|
|
while true
|
|
if md = TypeAndValue.match(str)
|
|
remain = md.post_match
|
|
type = md[1]
|
|
value, tag = expand_value(md[2], md[3], md[4]) rescue nil
|
|
if value
|
|
type_and_value = [type, value]
|
|
type_and_value.push(tag) if tag
|
|
ary.unshift(type_and_value)
|
|
if remain.length > 2 && remain[0] == ?,
|
|
str = remain[1..-1]
|
|
next
|
|
elsif remain.length > 2 && remain[0] == ?+
|
|
raise OpenSSL::X509::NameError,
|
|
"multi-valued RDN is not supported: #{dn}"
|
|
elsif remain.empty?
|
|
break
|
|
end
|
|
end
|
|
end
|
|
msg_dn = dn[0, dn.length - str.length] + " =>" + str
|
|
raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
|
|
end
|
|
return ary
|
|
end
|
|
end
|
|
|
|
class << self
|
|
def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
|
|
ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
|
|
self.new(ary, template)
|
|
end
|
|
|
|
def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
|
|
if str.start_with?("/")
|
|
# /A=B/C=D format
|
|
ary = str[1..-1].split("/").map { |i| i.split("=", 2) }
|
|
else
|
|
# Comma-separated
|
|
ary = str.split(",").map { |i| i.strip.split("=", 2) }
|
|
end
|
|
self.new(ary, template)
|
|
end
|
|
|
|
alias parse parse_openssl
|
|
end
|
|
|
|
def pretty_print(q)
|
|
q.object_group(self) {
|
|
q.text ' '
|
|
q.text to_s(OpenSSL::X509::Name::RFC2253)
|
|
}
|
|
end
|
|
end
|
|
|
|
class StoreContext
|
|
def cleanup
|
|
warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
|
|
end
|
|
end
|
|
|
|
class Certificate
|
|
def pretty_print(q)
|
|
q.object_group(self) {
|
|
q.breakable
|
|
q.text 'subject='; q.pp self.subject; q.text ','; q.breakable
|
|
q.text 'issuer='; q.pp self.issuer; q.text ','; q.breakable
|
|
q.text 'serial='; q.pp self.serial; q.text ','; q.breakable
|
|
q.text 'not_before='; q.pp self.not_before; q.text ','; q.breakable
|
|
q.text 'not_after='; q.pp self.not_after
|
|
}
|
|
end
|
|
end
|
|
end
|
|
end
|