diff options
| author | Ben Toews <mastahyeti@gmail.com> | 2019-06-27 09:15:39 -0600 |
|---|---|---|
| committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2019-09-27 17:57:31 +1200 |
| commit | 1219f70f4a5e0cf463f4929278d10943af18f6eb (patch) | |
| tree | 7b176ea883f2d7cbcef9d9cbfb6e73c52be853c8 /test | |
| parent | ea702a106d3d8136c48f244593de95666be0edf9 (diff) | |
| download | ruby-openssl-1219f70f4a5e0cf463f4929278d10943af18f6eb.tar.gz | |
simplify AKI parsing to only return keyIdentifier field
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_x509cert.rb | 5 | ||||
| -rw-r--r-- | test/test_x509crl.rb | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb index 088be10c..a490ccfc 100644 --- a/test/test_x509cert.rb +++ b/test/test_x509cert.rb @@ -76,11 +76,8 @@ class OpenSSL::TestX509Certificate < OpenSSL::TestCase ["authorityKeyIdentifier","issuer:always,keyid:always",false], ] ca_cert = issue_cert(@ca, @rsa2048, 1, ca_exts, nil, nil) - aki_fields = ca_cert.authority_key_identifier keyid = get_subject_key_id(ca_cert.to_der, hex: false) - assert_equal keyid, aki_fields[:key_identifier] - assert_equal ca_cert.subject, aki_fields[:authority_cert_issuer] - assert_equal ca_cert.serial, aki_fields[:authority_cert_serial_number] + assert_equal keyid, ca_cert.authority_key_identifier assert_equal keyid, ca_cert.subject_key_identifier ca_cert.extensions.each_with_index{|ext, i| assert_equal(ca_exts[i].first, ext.oid) diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb index efdcc065..580052c6 100644 --- a/test/test_x509crl.rb +++ b/test/test_x509crl.rb @@ -132,16 +132,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase assert_equal(false, exts[0].critical?) expected_keyid = OpenSSL::TestUtils.get_subject_key_id(cert, hex: false) - actual_keyid = crl.authority_key_identifier[:key_identifier] - assert_equal expected_keyid, actual_keyid - - expected_issuer = cert.issuer - actual_issuer = crl.authority_key_identifier[:authority_cert_issuer] - assert_equal expected_issuer, actual_issuer - - expected_serial = cert.serial - actual_serial = crl.authority_key_identifier[:authority_cert_serial_number] - assert_equal expected_serial, actual_serial + assert_equal expected_keyid, crl.authority_key_identifier assert_equal("authorityKeyIdentifier", exts[1].oid) keyid = OpenSSL::TestUtils.get_subject_key_id(cert) |