Refactor PEMParser

Author: peterdettman

pkix/src/main/java/org/bouncycastle/openssl/PEMParser.java

@@ -10,7 +10,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1BitString;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
@@ -110,22 +110,19 @@ public Object readObject()
         throws IOException
     {
         PemObject obj = readPemObject();
+        if (obj == null)
+        {
+            return null;
+        }
 
-        if (obj != null)
+        String type = obj.getType();
+        Object pemObjectParser = parsers.get(type);
+        if (pemObjectParser == null)
         {
-            String type = obj.getType();
-            Object pemObjectParser = parsers.get(type);
-            if (pemObjectParser != null)
-            {
-                return ((PemObjectParser)pemObjectParser).parseObject(obj);
-            }
-            else
-            {
-                throw new IOException("unrecognised object: " + type);
-            }
+            throw new IOException("unrecognised object: " + type);
         }
 
-        return null;
+        return ((PemObjectParser)pemObjectParser).parseObject(obj);
     }
 
     /**
@@ -268,16 +265,14 @@ public PEMKeyPair parse(byte[] encoding)
                     pKey.getParametersObject());
                 PrivateKeyInfo privInfo = new PrivateKeyInfo(algId, pKey);
 
-                if (pKey.getPublicKey() != null)
+                ASN1BitString publicKey = pKey.getPublicKey();
+                SubjectPublicKeyInfo pubInfo = null;
+                if (publicKey != null)
                 {
-                    SubjectPublicKeyInfo pubInfo = new SubjectPublicKeyInfo(algId, pKey.getPublicKey().getBytes());
-
-                    return new PEMKeyPair(pubInfo, privInfo);
-                }
-                else
-                {
-                    return new PEMKeyPair(null, privInfo);
+                    pubInfo = new SubjectPublicKeyInfo(algId, publicKey.getBytes());
                 }
+
+                return new PEMKeyPair(pubInfo, privInfo);
             }
             catch (IOException e)
             {
@@ -353,9 +348,10 @@ public Object parseObject(PemObject obj)
         {
             try
             {
+                AlgorithmIdentifier algId = new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE);
                 RSAPublicKey rsaPubStructure = RSAPublicKey.getInstance(obj.getContent());
 
-                return new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), rsaPubStructure);
+                return new SubjectPublicKeyInfo(algId, rsaPubStructure);
             }
             catch (IOException e)
             {
@@ -475,9 +471,7 @@ public Object parseObject(PemObject obj)
         {
             try
             {
-                ASN1InputStream aIn = new ASN1InputStream(obj.getContent());
-
-                return ContentInfo.getInstance(aIn.readObject());
+                return ContentInfo.getInstance(obj.getContent());
             }
             catch (Exception e)
             {
@@ -508,7 +502,7 @@ public Object parseObject(PemObject obj)
 
                 if (param instanceof ASN1ObjectIdentifier)
                 {
-                    return ASN1Primitive.fromByteArray(obj.getContent());
+                    return param;
                 }
                 else if (param instanceof ASN1Sequence)
                 {

pkix/src/test/java/org/bouncycastle/openssl/test/ParserTest.java

@@ -301,7 +301,7 @@ public void performTest()
         {
             if (privInfo instanceof PrivateKeyInfo)
             {
-                privKey = (RSAPrivateCrtKey)converter.getPrivateKey(PrivateKeyInfo.getInstance(privInfo));
+                privKey = (RSAPrivateCrtKey)converter.getPrivateKey((PrivateKeyInfo)privInfo);
             }
             else
             {