diff options
Diffstat (limited to 'test/openssl/test_ts.rb')
| -rw-r--r-- | test/openssl/test_ts.rb | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/test/openssl/test_ts.rb b/test/openssl/test_ts.rb index 1fa4a7cf..6e9c3089 100644 --- a/test/openssl/test_ts.rb +++ b/test/openssl/test_ts.rb @@ -77,7 +77,7 @@ _end_of_pem_ assert_raise(OpenSSL::Timestamp::TimestampError) do req.to_der end - req.message_imprint = OpenSSL::Digest::SHA1.new.digest("data") + req.message_imprint = OpenSSL::Digest.digest('SHA1', "data") req.to_der end @@ -160,7 +160,7 @@ _end_of_pem_ def test_request_encode_decode req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -193,7 +193,7 @@ _end_of_pem_ def test_response_creation req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" @@ -232,7 +232,7 @@ _end_of_pem_ assert_raise(OpenSSL::Timestamp::TimestampError) do fac.create_timestamp(ee_key, ts_cert_ee, req) end - req.message_imprint = OpenSSL::Digest::SHA1.new.digest("data") + req.message_imprint = OpenSSL::Digest.digest('SHA1', "data") assert_raise(OpenSSL::Timestamp::TimestampError) do fac.create_timestamp(ee_key, ts_cert_ee, req) end @@ -258,7 +258,7 @@ _end_of_pem_ def test_response_allowed_digests req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - req.message_imprint = OpenSSL::Digest::SHA1.digest("test") + req.message_imprint = OpenSSL::Digest.digest('SHA1', "test") fac = OpenSSL::Timestamp::Factory.new fac.gen_time = Time.now @@ -275,13 +275,13 @@ _end_of_pem_ assert_equal OpenSSL::Timestamp::Response::GRANTED, resp.status # Explicitly allow SHA1 (object) - fac.allowed_digests = [OpenSSL::Digest::SHA1.new] + fac.allowed_digests = [OpenSSL::Digest.new('SHA1')] resp = fac.create_timestamp(ee_key, ts_cert_ee, req) assert_equal OpenSSL::Timestamp::Response::GRANTED, resp.status # Others not allowed req.algorithm = "SHA256" - req.message_imprint = OpenSSL::Digest::SHA256.digest("test") + req.message_imprint = OpenSSL::Digest.digest('SHA256', "test") resp = fac.create_timestamp(ee_key, ts_cert_ee, req) assert_equal OpenSSL::Timestamp::Response::REJECTION, resp.status @@ -291,7 +291,7 @@ _end_of_pem_ assert_equal OpenSSL::Timestamp::Response::REJECTION, resp.status # Non-String, non-Digest Array element - fac.allowed_digests = ["sha1", OpenSSL::Digest::SHA1.new, 123] + fac.allowed_digests = ["sha1", OpenSSL::Digest.new('SHA1'), 123] assert_raise(TypeError) do fac.create_timestamp(ee_key, ts_cert_ee, req) end @@ -300,7 +300,7 @@ _end_of_pem_ def test_response_default_policy req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest fac = OpenSSL::Timestamp::Factory.new @@ -317,7 +317,7 @@ _end_of_pem_ def test_response_bad_purpose req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -336,7 +336,7 @@ _end_of_pem_ def test_no_cert_requested req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.cert_requested = false @@ -355,7 +355,7 @@ _end_of_pem_ assert_raise(OpenSSL::Timestamp::TimestampError) do req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest fac = OpenSSL::Timestamp::Factory.new @@ -423,7 +423,7 @@ _end_of_pem_ def test_verify_ee_def_policy req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.nonce = 42 @@ -481,7 +481,7 @@ _end_of_pem_ def test_verify_ee_additional_certs_array req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -501,7 +501,7 @@ _end_of_pem_ def test_verify_ee_additional_certs_with_root req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -518,7 +518,7 @@ _end_of_pem_ def test_verify_ee_cert_inclusion_not_requested req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.nonce = 42 req.cert_requested = false @@ -539,7 +539,7 @@ _end_of_pem_ #CTX_free methods don't mess up e.g. the certificates req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -560,7 +560,7 @@ _end_of_pem_ def test_token_info_creation req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = OpenSSL::BN.new(123) @@ -594,7 +594,7 @@ _end_of_pem_ def timestamp_ee req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -609,7 +609,7 @@ _end_of_pem_ def timestamp_ee_no_cert req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -625,7 +625,7 @@ _end_of_pem_ def timestamp_direct req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 @@ -640,7 +640,7 @@ _end_of_pem_ def timestamp_direct_no_cert req = OpenSSL::Timestamp::Request.new req.algorithm = "SHA1" - digest = OpenSSL::Digest::SHA1.new.digest("test") + digest = OpenSSL::Digest.digest('SHA1', "test") req.message_imprint = digest req.policy_id = "1.2.3.4.5" req.nonce = 42 |