Merge branch 'pgpainless-wrapPGPObjectFactory'

Author: dghgit

pg/src/main/java/org/bouncycastle/bcpg/BCPGInputStream.java

@@ -26,6 +26,22 @@ public BCPGInputStream(
         this.in = in;
     }
 
+    /**
+     * If the argument is a {@link BCPGInputStream}, return it.
+     * Otherwise wrap it in a {@link BCPGInputStream} and then return the result.
+     *
+     * @param in input stream
+     * @return BCPGInputStream
+     */
+    public static BCPGInputStream wrap(InputStream in)
+    {
+        if (in instanceof BCPGInputStream)
+        {
+            return (BCPGInputStream)in;
+        }
+        return new BCPGInputStream(in);
+    }
+
     public int available()
         throws IOException
     {

pg/src/main/java/org/bouncycastle/openpgp/PGPKeyRing.java

@@ -1,7 +1,6 @@
 package org.bouncycastle.openpgp;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -30,16 +29,6 @@ public abstract class PGPKeyRing
     {
     }
 
-    static BCPGInputStream wrap(InputStream in)
-    {
-        if (in instanceof BCPGInputStream)
-        {
-            return (BCPGInputStream)in;
-        }
-
-        return new BCPGInputStream(in);
-    }
-
     static TrustPacket readOptionalTrustPacket(
         BCPGInputStream pIn)
         throws IOException

pg/src/main/java/org/bouncycastle/openpgp/PGPObjectFactory.java

@@ -54,7 +54,7 @@ public PGPObjectFactory(
         InputStream              in,
         KeyFingerPrintCalculator fingerPrintCalculator)
     {
-        this.in = new BCPGInputStream(in);
+        this.in = BCPGInputStream.wrap(in);
         this.fingerPrintCalculator = fingerPrintCalculator;
     }
 

pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java

@@ -94,7 +94,7 @@ public PGPPublicKeyRing(
     {
         this.keys = new ArrayList<PGPPublicKey>();
 
-        BCPGInputStream pIn = wrap(in);
+        BCPGInputStream pIn = BCPGInputStream.wrap(in);
 
         int initialTag = pIn.skipMarkerPackets();
         if (initialTag != PacketTags.PUBLIC_KEY && initialTag != PacketTags.PUBLIC_SUBKEY)

pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java

@@ -101,7 +101,7 @@ public PGPSecretKeyRing(
         this.keys = new ArrayList<PGPSecretKey>();
         this.extraPubKeys = new ArrayList<PGPPublicKey>();
 
-        BCPGInputStream pIn = wrap(in);
+        BCPGInputStream pIn = BCPGInputStream.wrap(in);
 
         int initialTag = pIn.skipMarkerPackets();
         if (initialTag != PacketTags.SECRET_KEY && initialTag != PacketTags.SECRET_SUBKEY)