diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2021-09-27 00:14:44 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2021-09-27 11:26:53 +0900 |
| commit | c12b77f79b77915b224c6bda81f8241b928a3b14 (patch) | |
| tree | 289e774d83a60110f03601df9f09cd0e1ed54cc7 | |
| parent | 0b18d188572cb61e2f914f38b46d2f2a405b9323 (diff) | |
| parent | b74e43bd71b9870e335da0120f5314cd6096e7e9 (diff) | |
| download | ruby-openssl-c12b77f79b77915b224c6bda81f8241b928a3b14.tar.gz | |
Merge branch 'maint-2.1' into maint-2.2
* maint-2.1: (22 commits)
test/openssl/test_ssl: skip test_fallback_scsv if necessary
test/openssl/test_ssl.rb: ignore SSLError when the connection is closed
Fixed misspellings
ext/openssl/extconf.rb: do not use -Werror=deprecated-declarations
Guard static variable first
ext/openssl/ossl_ssl.c: Use const declaration if LibreSSL >= 2.8.0
drop-in type check for rb_define_module_function
rb_iterate now takes rb_block_call_func_t
Add a /* fall through */ comment
test/openssl/utils.rb: Extend the timeout
test/test_ssl.rb: Use TLS1.2
test/test_ssl.rb: Use larger keys
test: use larger keys for SSL tests
test/test_pair: fix deadlock in test_connect_accept_nonblock
Ignore warnings about ambiguous first argument with the negative integer.
ext/openssl/ossl_bn.c (ossl_bn_initialize): get rid of SEGV
errno.h must be included after config.h because config.h might define _REENTRANT, _THREAD_SAFE, etc., which affect how errno is defined on some architectures
Fix call-seq of OpenSSL.fips_mode and WIN32OLE_METHOD#name [ci skip]
Remove -Wno-parentheses flag.
Correctly verify abbreviated IPv6 SANs
...
| -rw-r--r-- | openssl.gemspec | 1 | ||||
| -rw-r--r-- | test/openssl/test_config.rb | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/openssl.gemspec b/openssl.gemspec index 471a3c42..a278ce92 100644 --- a/openssl.gemspec +++ b/openssl.gemspec @@ -17,6 +17,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.3.0" + spec.add_runtime_dependency "ipaddr" spec.add_development_dependency "rake" spec.add_development_dependency "rake-compiler" spec.add_development_dependency "test-unit", "~> 3.0" diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb index f65392c1..e041c1a3 100644 --- a/test/openssl/test_config.rb +++ b/test/openssl/test_config.rb @@ -61,14 +61,14 @@ foo\\bar::foo\\bar = baz [default1 default2]\t\t # space is allowed in section name fo =b ar # space allowed in value [emptysection] - [doller ] + [dollar ] foo=bar bar = $(foo) baz = 123$(default::bar)456${foo}798 qux = ${baz} quxx = $qux.$qux __EOC__ - assert_equal(['default', 'default1 default2', 'doller', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort) + assert_equal(['default', 'default1 default2', 'dollar', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort) assert_equal(['', 'a', 'bar', 'baz', 'd', 'dq', 'dq2', 'esc', 'foo\\bar', 'sq'], c['default'].keys.sort) assert_equal('c', c['default']['']) assert_equal('', c['default']['a']) @@ -84,12 +84,12 @@ __EOC__ assert_equal('baz', c['foo\\bar']['foo\\bar']) assert_equal('b ar', c['default1 default2']['fo']) - # dolloer - assert_equal('bar', c['doller']['foo']) - assert_equal('bar', c['doller']['bar']) - assert_equal('123baz456bar798', c['doller']['baz']) - assert_equal('123baz456bar798', c['doller']['qux']) - assert_equal('123baz456bar798.123baz456bar798', c['doller']['quxx']) + # dollar + assert_equal('bar', c['dollar']['foo']) + assert_equal('bar', c['dollar']['bar']) + assert_equal('123baz456bar798', c['dollar']['baz']) + assert_equal('123baz456bar798', c['dollar']['qux']) + assert_equal('123baz456bar798.123baz456bar798', c['dollar']['quxx']) excn = assert_raise(OpenSSL::ConfigError) do OpenSSL::Config.parse("foo = $bar") |