simplify AKI parsing to only return keyIdentifier field

3 files changed, 12 insertions, 74 deletions

diff --git a/lib/openssl/x509.rb b/lib/openssl/x509.rb
index 89f15933..4f3a4337 100644
--- a/lib/openssl/x509.rb
+++ b/lib/openssl/x509.rb
@@ -65,28 +65,16 @@ module OpenSSL
         def find_extension(oid)
           extensions.find { |e| e.oid == oid }
         end
-
-        def x509_name_from_general_name(gn_asn1)
-          unless gn_asn1.tag_class == :CONTEXT_SPECIFIC
-            raise ASN1::ASN1Error "invalid GeneralName"
-          end
-
-          if gn_asn1.tag == 4
-            Name.new(gn_asn1.value.first.to_der)
-          else
-            # TODO: raise error instead of returning nil?
-            # this is some other kind of general name.
-            nil
-          end
-        end
       end
 
       module SubjectKeyIdentifier
         include Helpers
 
-        # Described in RFC5280 Section 4.2.1.2
+        # Get the subject's key identifier from the subjectKeyIdentifier
+        # exteension, as described in RFC5280 Section 4.2.1.2.
         #
-        # Returns a binary String key identifier or nil.
+        # Returns the binary String key identifier or nil or raises
+        # ASN1::ASN1Error.
         def subject_key_identifier
           ext = find_extension("subjectKeyIdentifier")
           return nil if ext.nil?
@@ -103,10 +91,12 @@ module OpenSSL
       module AuthorityKeyIdentifier
         include Helpers
 
-        # Described in RFC5280 Section 4.2.1.1
+        # Get the issuing certificate's key identifier from the
+        # authorityKeyIdentifier extension, as described in RFC5280
+        # Section 4.2.1.1
         #
-        # Returns a Hash with keys :key_identifier, :authority_cert_issuer,
-        # and :authority_cert_serial_number.
+        # Returns the binary String keyIdentifier or nil or raises
+        # ASN1::ASN1Error.
         def authority_key_identifier
           ext = find_extension("authorityKeyIdentifier")
           return nil if ext.nil?
@@ -116,51 +106,11 @@ module OpenSSL
             raise ASN1::ASN1Error "invalid extension"
           end
 
-          fields = {}
-
           key_id = aki_asn1.value.find do |v|
             v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0
           end
 
-          issuer = aki_asn1.value.find do |v|
-            v.tag_class == :CONTEXT_SPECIFIC && v.tag == 1
-          end
-
-          serial = aki_asn1.value.find do |v|
-            v.tag_class == :CONTEXT_SPECIFIC && v.tag == 2
-          end
-
-          # must have neither or both of issuer and serial
-          if (!issuer.nil? && serial.nil?) || (issuer.nil? && !serial.nil?)
-            raise ASN1::ASN1Error "invalid extension"
-          end
-
-          fields[:key_identifier] = if !key_id.nil?
-            key_id.value
-          else
-            nil
-          end
-
-          fields[:authority_cert_issuer] = if !issuer.nil?
-            # TODO raise if there are more than one values? GeneralNames is a
-            # SEQUENCE.
-            x509_name_from_general_name(issuer.value.first)
-          else
-            nil
-          end
-
-          fields[:authority_cert_serial_number] = if !serial.nil?
-            # encode/decode as integer to get value parsed as BN
-            ASN1.decode(ASN1::ASN1Data.new(
-              serial.value,
-              ASN1::INTEGER,
-              :UNIVERSAL
-            ).to_der).value
-          else
-            nil
-          end
-
-          fields
+          key_id.nil? ? nil : key_id.value
         end
       end
     end
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)