diff options
Diffstat (limited to 'test/openssl')
-rw-r--r-- | test/openssl/test_asn1.rb | 2 | ||||
-rw-r--r-- | test/openssl/test_engine.rb | 2 | ||||
-rw-r--r-- | test/openssl/test_pkcs12.rb | 4 | ||||
-rw-r--r-- | test/openssl/test_pkcs7.rb | 2 | ||||
-rw-r--r-- | test/openssl/test_pkey_ec.rb | 2 | ||||
-rw-r--r-- | test/openssl/test_ssl.rb | 14 |
6 files changed, 13 insertions, 13 deletions
diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb index 811fe387fa..e67a96a03a 100644 --- a/test/openssl/test_asn1.rb +++ b/test/openssl/test_asn1.rb @@ -200,7 +200,7 @@ class OpenSSL::TestASN1 < Test::Unit::TestCase def test_encode_nil m = OpenSSL::ASN1 - [ + [ m::Boolean, m::Integer, m::BitString, m::OctetString, m::ObjectId, m::Enumerated, m::UTF8String, m::UTCTime, m::GeneralizedTime, m::Sequence, m::Set diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb index 5b90054c8f..46a2948cbf 100644 --- a/test/openssl/test_engine.rb +++ b/test/openssl/test_engine.rb @@ -56,7 +56,7 @@ class OpenSSL::TestEngine < Test::Unit::TestCase $stderr.reopen(err_back) err_back.close end - end + end private diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb index 64e7530700..9f12bc5dc8 100644 --- a/test/openssl/test_pkcs12.rb +++ b/test/openssl/test_pkcs12.rb @@ -16,7 +16,7 @@ module OpenSSL ["subjectKeyIdentifier","hash",false], ["authorityKeyIdentifier","keyid:always",false], ] - + @cacert = issue_cert(ca, TEST_KEY_RSA2048, 1, now, now+3600, ca_exts, nil, nil, OpenSSL::Digest::SHA1.new) @@ -108,7 +108,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es= assert_equal chain.size, decoded.ca_certs.size assert_include_cert @cacert, decoded.ca_certs assert_include_cert @inter_cacert, decoded.ca_certs - assert_cert @mycert, decoded.certificate + assert_cert @mycert, decoded.certificate assert_equal TEST_KEY_RSA1024.to_der, decoded.key.to_der end diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb index b17cbda0b2..4a6692a74c 100644 --- a/test/openssl/test_pkcs7.rb +++ b/test/openssl/test_pkcs7.rb @@ -146,7 +146,7 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase assert_equal(3, recip[1].serial) assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert)) end - + def test_graceful_parsing_failure #[ruby-core:43250] contents = File.read(__FILE__) assert_raise(ArgumentError) { OpenSSL::PKCS7.new(contents) } diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb index 7b266a772b..f151335b6e 100644 --- a/test/openssl/test_pkey_ec.rb +++ b/test/openssl/test_pkey_ec.rb @@ -119,7 +119,7 @@ class OpenSSL::TestEC < Test::Unit::TestCase assert_equal(a, b) end end - + def test_read_private_key_der ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1 der = ec.to_der diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 97a3a46169..b72e75ed41 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -412,7 +412,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase # SSL/TLS version that has been marked as forbidden, therefore either of # these may be raised FORBIDDEN_PROTOCOL_ERRORS = [OpenSSL::SSL::SSLError, Errno::ECONNRESET] - + if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1 def test_forbid_ssl_v3_for_client @@ -515,7 +515,7 @@ end } } end - + private def start_server_version(version, ctx_proc=nil, server_proc=nil, &blk) @@ -524,11 +524,11 @@ end ctx_proc.call(ctx) if ctx_proc } start_server( - PORT, - OpenSSL::SSL::VERIFY_NONE, - true, - :ctx_proc => ctx_wrap, - :server_proc => server_proc, + PORT, + OpenSSL::SSL::VERIFY_NONE, + true, + :ctx_proc => ctx_wrap, + :server_proc => server_proc, &blk ) end |