Add OpenPGPV6KeyGeneratorTest

Author: gefeili

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

@@ -0,0 +1,56 @@
+package org.bouncycastle.bcpg;
+
+/**
+ * Utility methods related to OpenPGP public key algorithms.
+ */
+public class PublicKeyUtils
+{
+
+    /**
+     * Return true, if the public key algorithm that corresponds to the given ID is capable of signing.
+     *
+     * @param publicKeyAlgorithm public key algorithm id
+     * @return true if algorithm can sign
+     */
+    public static boolean isSigningAlgorithm(int publicKeyAlgorithm)
+    {
+        switch (publicKeyAlgorithm)
+        {
+        case PublicKeyAlgorithmTags.RSA_GENERAL:
+        case PublicKeyAlgorithmTags.RSA_SIGN:
+        case PublicKeyAlgorithmTags.DSA:
+        case PublicKeyAlgorithmTags.ECDSA:
+        case PublicKeyAlgorithmTags.ELGAMAL_GENERAL:
+        case PublicKeyAlgorithmTags.EDDSA_LEGACY:
+        case PublicKeyAlgorithmTags.Ed25519:
+        case PublicKeyAlgorithmTags.Ed448:
+            return true;
+        default:
+            return false;
+        }
+    }
+
+//    /**
+//     * Return true, if the public key algorithm that corresponds to the given ID is capable of encryption.
+//     *
+//     * @param publicKeyAlgorithm public key algorithm id
+//     * @return true if algorithm can encrypt
+//     */
+//    public static boolean isEncryptionAlgorithm(int publicKeyAlgorithm)
+//    {
+//        switch (publicKeyAlgorithm)
+//        {
+//        case PublicKeyAlgorithmTags.RSA_GENERAL:
+//        case PublicKeyAlgorithmTags.RSA_ENCRYPT:
+//        case PublicKeyAlgorithmTags.ELGAMAL_ENCRYPT:
+//        case PublicKeyAlgorithmTags.ECDH:
+//        case PublicKeyAlgorithmTags.ELGAMAL_GENERAL:
+//        case PublicKeyAlgorithmTags.DIFFIE_HELLMAN:
+//        case PublicKeyAlgorithmTags.X25519:
+//        case PublicKeyAlgorithmTags.X448:
+//            return true;
+//        default:
+//            return false;
+//        }
+//    }
+}

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

@@ -1,30 +1,32 @@
 package org.bouncycastle.openpgp;
 
 import org.bouncycastle.bcpg.KeyIdentifier;
+import org.bouncycastle.bcpg.PublicSubkeyPacket;
+import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 
 /**
  * General class to handle JCA key pairs and convert them into OpenPGP ones.
  * <p>
  * A word for the unwary, the KeyID for a OpenPGP public key is calculated from
- * a hash that includes the time of creation, if you pass a different date to the 
+ * a hash that includes the time of creation, if you pass a different date to the
  * constructor below with the same public private key pair the KeyID will not be the
- * same as for previous generations of the key, so ideally you only want to do 
+ * same as for previous generations of the key, so ideally you only want to do
  * this once.
  */
 public class PGPKeyPair
 {
-    protected PGPPublicKey        pub;
-    protected PGPPrivateKey       priv;
+    protected PGPPublicKey pub;
+    protected PGPPrivateKey priv;
 
     /**
      * Create a key pair from a PGPPrivateKey and a PGPPublicKey.
-     * 
-     * @param pub the public key
+     *
+     * @param pub  the public key
      * @param priv the private key
      */
     public PGPKeyPair(
-        PGPPublicKey    pub,
-        PGPPrivateKey   priv)
+        PGPPublicKey pub,
+        PGPPrivateKey priv)
     {
         this.pub = pub;
         this.priv = priv;
@@ -36,7 +38,7 @@ protected PGPKeyPair()
 
     /**
      * Return the keyID associated with this key pair.
-     * 
+     *
      * @return keyID
      */
     public long getKeyID()
@@ -53,14 +55,32 @@ public KeyIdentifier getKeyIdentifier()
     {
         return getPublicKey().getKeyIdentifier();
     }
-    
+
     public PGPPublicKey getPublicKey()
     {
         return pub;
     }
-    
+
     public PGPPrivateKey getPrivateKey()
     {
         return priv;
     }
+
+    public PGPKeyPair asSubkey(KeyFingerPrintCalculator fingerPrintCalculator)
+        throws PGPException
+    {
+        if (pub.getPublicKeyPacket() instanceof PublicSubkeyPacket)
+        {
+            return this; // is already subkey
+        }
+
+        PublicSubkeyPacket pubSubPkt = new PublicSubkeyPacket(
+            pub.getVersion(),
+            pub.getAlgorithm(),
+            pub.getCreationTime(),
+            pub.getPublicKeyPacket().getKey());
+        return new PGPKeyPair(
+            new PGPPublicKey(pubSubPkt, fingerPrintCalculator),
+            new PGPPrivateKey(pub.getKeyID(), pubSubPkt, priv.getPrivateKeyDataPacket()));
+    }
 }

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

@@ -492,14 +492,31 @@ public int size()
         return keys.size();
     }
 
+    /**
+     * Return the OpenPGP certificate (Transferable Public Key) of this key.
+     *
+     * @return certificate
+     */
+    public PGPPublicKeyRing toCertificate()
+    {
+        List<PGPPublicKey> pubKeys = new ArrayList<PGPPublicKey>();
+        Iterator<PGPPublicKey> it = getPublicKeys();
+        while (it.hasNext())
+        {
+            pubKeys.add(it.next());
+        }
+        return new PGPPublicKeyRing(pubKeys);
+    }
+
     public byte[] getEncoded()
         throws IOException
     {
         return getEncoded(PacketFormat.ROUNDTRIP);
     }
 
     @Override
-    public byte[] getEncoded(PacketFormat format) throws IOException
+    public byte[] getEncoded(PacketFormat format)
+        throws IOException
     {
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         BCPGOutputStream pOut = new BCPGOutputStream(bOut, format);