[ruby/openssl] Do not require test file in a forked process in tests
https://github.com/ruby/openssl/commit/ae784673d7
This commit is contained in:
parent
1b06cd3f09
commit
5afc830130
@ -26,7 +26,7 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
|
|||||||
with_openssl <<-'end;'
|
with_openssl <<-'end;'
|
||||||
orig = OpenSSL::Engine.engines
|
orig = OpenSSL::Engine.engines
|
||||||
pend "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" }
|
pend "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" }
|
||||||
engine = get_engine
|
engine = OpenSSL::Engine.by_id("openssl")
|
||||||
assert_not_nil(engine)
|
assert_not_nil(engine)
|
||||||
assert_equal(1, OpenSSL::Engine.engines.size - orig.size)
|
assert_equal(1, OpenSSL::Engine.engines.size - orig.size)
|
||||||
end;
|
end;
|
||||||
@ -34,7 +34,7 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
|
|||||||
|
|
||||||
def test_openssl_engine_id_name_inspect
|
def test_openssl_engine_id_name_inspect
|
||||||
with_openssl <<-'end;'
|
with_openssl <<-'end;'
|
||||||
engine = get_engine
|
engine = OpenSSL::Engine.by_id("openssl")
|
||||||
assert_equal("openssl", engine.id)
|
assert_equal("openssl", engine.id)
|
||||||
assert_not_nil(engine.name)
|
assert_not_nil(engine.name)
|
||||||
assert_not_nil(engine.inspect)
|
assert_not_nil(engine.inspect)
|
||||||
@ -43,7 +43,7 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
|
|||||||
|
|
||||||
def test_openssl_engine_digest_sha1
|
def test_openssl_engine_digest_sha1
|
||||||
with_openssl <<-'end;'
|
with_openssl <<-'end;'
|
||||||
engine = get_engine
|
engine = OpenSSL::Engine.by_id("openssl")
|
||||||
digest = engine.digest("SHA1")
|
digest = engine.digest("SHA1")
|
||||||
assert_not_nil(digest)
|
assert_not_nil(digest)
|
||||||
data = "test"
|
data = "test"
|
||||||
@ -59,12 +59,21 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
with_openssl(<<-'end;', ignore_stderr: true)
|
with_openssl(<<-'end;', ignore_stderr: true)
|
||||||
engine = get_engine
|
engine = OpenSSL::Engine.by_id("openssl")
|
||||||
algo = "RC4"
|
algo = "RC4"
|
||||||
data = "a" * 1000
|
data = "a" * 1000
|
||||||
key = OpenSSL::Random.random_bytes(16)
|
key = OpenSSL::Random.random_bytes(16)
|
||||||
encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
|
|
||||||
decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
|
cipher = engine.cipher(algo)
|
||||||
|
cipher.encrypt
|
||||||
|
cipher.key = key
|
||||||
|
encrypted = cipher.update(data) + cipher.final
|
||||||
|
|
||||||
|
cipher = OpenSSL::Cipher.new(algo)
|
||||||
|
cipher.decrypt
|
||||||
|
cipher.key = key
|
||||||
|
decrypted = cipher.update(encrypted) + cipher.final
|
||||||
|
|
||||||
assert_equal(data, decrypted)
|
assert_equal(data, decrypted)
|
||||||
end;
|
end;
|
||||||
end
|
end
|
||||||
@ -74,24 +83,9 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
|
|||||||
# this is required because OpenSSL::Engine methods change global state
|
# this is required because OpenSSL::Engine methods change global state
|
||||||
def with_openssl(code, **opts)
|
def with_openssl(code, **opts)
|
||||||
assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;", **opts)
|
assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;", **opts)
|
||||||
require #{__FILE__.dump}
|
|
||||||
include OpenSSL::TestEngine::Utils
|
|
||||||
#{code}
|
#{code}
|
||||||
end;
|
end;
|
||||||
end
|
end
|
||||||
|
|
||||||
module Utils
|
|
||||||
def get_engine
|
|
||||||
OpenSSL::Engine.by_id("openssl")
|
|
||||||
end
|
|
||||||
|
|
||||||
def crypt_data(data, key, mode)
|
|
||||||
cipher = yield
|
|
||||||
cipher.send mode
|
|
||||||
cipher.key = key
|
|
||||||
cipher.update(data) + cipher.final
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -12,8 +12,6 @@ class OpenSSL::TestFIPS < OpenSSL::TestCase
|
|||||||
def test_fips_mode_get
|
def test_fips_mode_get
|
||||||
return unless OpenSSL::OPENSSL_FIPS
|
return unless OpenSSL::OPENSSL_FIPS
|
||||||
assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;")
|
assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;")
|
||||||
require #{__FILE__.dump}
|
|
||||||
|
|
||||||
begin
|
begin
|
||||||
OpenSSL.fips_mode = true
|
OpenSSL.fips_mode = true
|
||||||
assert OpenSSL.fips_mode == true, ".fips_mode returns true when .fips_mode=true"
|
assert OpenSSL.fips_mode == true, ".fips_mode returns true when .fips_mode=true"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user