diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-08-26 17:18:41 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-08-26 17:20:32 +0900 |
| commit | 0bcd6499a8a3233a1bbbf1ba87a019673ec888f2 (patch) | |
| tree | 38a3938afe88851aa22a0cc3b0b17f4fda3e61b8 /test | |
| parent | b1a64e28043eaeadf0caf148d6bd24deebcdecca (diff) | |
| download | ruby-openssl-0bcd6499a8a3233a1bbbf1ba87a019673ec888f2.tar.gz | |
test/test_pkey: fix merge conflict error
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_pkey.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_pkey.rb b/test/test_pkey.rb index 7e960926..79647c8f 100644 --- a/test/test_pkey.rb +++ b/test/test_pkey.rb @@ -11,13 +11,13 @@ class OpenSSL::TestPKey < OpenSSL::PKeyTestCase }, OpenSSL::PKey::DSA => { key: OpenSSL::TestUtils::TEST_KEY_DSA512, - digest: OpenSSL::Digest::SHA1, + digest: OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST, }, } if defined?(OpenSSL::PKey::EC) PKEYS[OpenSSL::PKey::EC] = { key: OpenSSL::TestUtils::TEST_KEY_EC_P256V1, - digest: OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST, + digest: OpenSSL::Digest::SHA1, } end |