Misc. pkix refactoring

Author: peterdettman

pkix/src/main/java/org/bouncycastle/cert/X509ExtensionUtils.java

@@ -113,23 +113,16 @@ public SubjectKeyIdentifier createTruncatedSubjectKeyIdentifier(SubjectPublicKey
 
     private byte[] getSubjectKeyIdentifier(X509CertificateHolder certHolder)
     {
-        if (certHolder.getVersionNumber() != 3)
-        {
-            return calculateIdentifier(certHolder.getSubjectPublicKeyInfo());
-        }
-        else
+        if (certHolder.getVersionNumber() == 3)
         {
             Extension ext = certHolder.getExtension(Extension.subjectKeyIdentifier);
-
             if (ext != null)
             {
                 return ASN1OctetString.getInstance(ext.getParsedValue()).getOctets();
             }
-            else
-            {
-                return calculateIdentifier(certHolder.getSubjectPublicKeyInfo());
-            }
         }
+
+        return calculateIdentifier(certHolder.getSubjectPublicKeyInfo());
     }
 
     private byte[] calculateIdentifier(SubjectPublicKeyInfo publicKeyInfo)

pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java

@@ -2864,7 +2864,7 @@ public void checkCRLCreation5()
         {
             ASN1Enumerated reasonCode = (ASN1Enumerated)fromExtensionValue(ext);
 
-            if (reasonCode.intValueExact() != CRLReason.privilegeWithdrawn)
+            if (!reasonCode.hasValue(CRLReason.privilegeWithdrawn))
             {
                 fail("CRL entry reasonCode wrong");
             }

pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java

@@ -1976,6 +1976,17 @@ public void testECDSASHA512Encapsulated()
         encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA512withECDSA");
     }
 
+    public void testECDSASHA512EncapsulatedWithKeyFactoryAsEC()
+        throws Exception
+    {
+        X509EncodedKeySpec  pubSpec = new X509EncodedKeySpec(_signEcDsaKP.getPublic().getEncoded());
+        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(_signEcDsaKP.getPrivate().getEncoded());
+        KeyFactory          keyFact = KeyFactory.getInstance("EC", BC);
+        KeyPair             kp = new KeyPair(keyFact.generatePublic(pubSpec), keyFact.generatePrivate(privSpec));
+        
+        encapsulatedTest(kp, _signEcDsaCert, "SHA512withECDSA");
+    }
+
     public void testECDSASHA3_224Encapsulated()
         throws Exception
     {
@@ -2048,17 +2059,6 @@ public void testPLAIN_ECDSASHA3_512Encapsulated()
         encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA3-512withPLAIN-ECDSA");
     }
 
-    public void testECDSASHA512EncapsulatedWithKeyFactoryAsEC()
-        throws Exception
-    {
-        X509EncodedKeySpec  pubSpec = new X509EncodedKeySpec(_signEcDsaKP.getPublic().getEncoded());
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(_signEcDsaKP.getPrivate().getEncoded());
-        KeyFactory          keyFact = KeyFactory.getInstance("EC", BC);
-        KeyPair             kp = new KeyPair(keyFact.generatePublic(pubSpec), keyFact.generatePrivate(privSpec));
-        
-        encapsulatedTest(kp, _signEcDsaCert, "SHA512withECDSA");
-    }
-
     public void testDSAEncapsulated()
         throws Exception
     {

prov/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java

@@ -1,6 +1,7 @@
 package org.bouncycastle.x509.extension;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.security.InvalidKeyException;
 import java.security.PublicKey;
 import java.security.cert.CertificateParsingException;
@@ -59,48 +60,36 @@ public AuthorityKeyIdentifierStructure(
         super((ASN1Sequence)extension.getParsedValue());
     }
 
-    private static ASN1Sequence fromCertificate(
-        X509Certificate certificate)
+    private static ASN1Sequence fromCertificate(X509Certificate certificate)
         throws CertificateParsingException
     {
         try
         {
-            if (certificate.getVersion() != 3)
-            {
-                GeneralName          genName = new GeneralName(PrincipalUtil.getIssuerX509Principal(certificate));
-                SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(certificate.getPublicKey().getEncoded());
-                
-                return (ASN1Sequence)new AuthorityKeyIdentifier(
-                               info, new GeneralNames(genName), certificate.getSerialNumber()).toASN1Primitive();
-            }
-            else
+            GeneralName genName = new GeneralName(PrincipalUtil.getIssuerX509Principal(certificate));
+            GeneralNames genNames = new GeneralNames(genName);
+            BigInteger serialNumber = certificate.getSerialNumber();
+
+            if (certificate.getVersion() == 3)
             {
-                GeneralName             genName = new GeneralName(PrincipalUtil.getIssuerX509Principal(certificate));
-                
-                byte[]                  ext = certificate.getExtensionValue(Extension.subjectKeyIdentifier.getId());
-                
+                byte[] ext = certificate.getExtensionValue(Extension.subjectKeyIdentifier.getId());
                 if (ext != null)
                 {
-                    ASN1OctetString     str = (ASN1OctetString)X509ExtensionUtil.fromExtensionValue(ext);
-                
-                    return (ASN1Sequence)new AuthorityKeyIdentifier(
-                                    str.getOctets(), new GeneralNames(genName), certificate.getSerialNumber()).toASN1Primitive();
-                }
-                else
-                {
-                    SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(certificate.getPublicKey().getEncoded());
-                    
-                    return (ASN1Sequence)new AuthorityKeyIdentifier(
-                            info, new GeneralNames(genName), certificate.getSerialNumber()).toASN1Primitive();
+                    ASN1OctetString str = (ASN1OctetString)X509ExtensionUtil.fromExtensionValue(ext);
+                    return (ASN1Sequence)new AuthorityKeyIdentifier(str.getOctets(), genNames, serialNumber)
+                        .toASN1Primitive();
                 }
             }
+
+            SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(certificate.getPublicKey().getEncoded());
+
+            return (ASN1Sequence)new AuthorityKeyIdentifier(info, genNames, serialNumber).toASN1Primitive();
         }
         catch (Exception e)
         {
             throw new CertificateParsingException("Exception extracting certificate details: " + e.toString());
         }
     }
-    
+
     private static ASN1Sequence fromKey(
         PublicKey pubKey)
         throws InvalidKeyException