Add back PublicKeyDataDecryptorFactory.recoverSessionData(int keyAlgorithm, byte[][] secKeyData) function

Author: gefeili

pg/src/main/java/org/bouncycastle/openpgp/operator/AbstractPublicKeyDataDecryptorFactory.java

@@ -21,6 +21,12 @@ public final byte[] recoverSessionData(PublicKeyEncSessionPacket pkesk, InputStr
         return prependSKAlgorithmToSessionData(pkesk, encData, sessionData);
     }
 
+    @Override
+    public byte[] recoverSessionData(int keyAlgorithm, byte[][] secKeyData)
+        throws PGPException
+    {
+        return recoverSessionData(keyAlgorithm, secKeyData, PublicKeyEncSessionPacket.VERSION_3);
+    }
 
     protected byte[] prependSKAlgorithmToSessionData(PublicKeyEncSessionPacket pkesk,
                                                    InputStreamPacket encData,

pg/src/main/java/org/bouncycastle/openpgp/operator/PublicKeyDataDecryptorFactory.java

@@ -20,6 +20,21 @@ public interface PublicKeyDataDecryptorFactory
     byte[] recoverSessionData(PublicKeyEncSessionPacket pkesk, InputStreamPacket encData)
             throws PGPException;
 
+    /**
+     * Recover the plain session info by decrypting the encrypted session key.
+     * This method returns the decrypted session info as-is (without prefixing missing cipher algorithm),
+     * so the return value is:
+     * <pre>[sym-alg]?[session-key][checksum]?</pre>
+     *
+     * @deprecated use {@link #recoverSessionData(PublicKeyEncSessionPacket, InputStreamPacket)} instead.
+     * @param keyAlgorithm public key algorithm
+     * @param secKeyData encrypted session key data
+     * @return decrypted session info
+     * @throws PGPException
+     */
+    byte[] recoverSessionData(int keyAlgorithm, byte[][] secKeyData)
+        throws PGPException;
+
     /**
      * Recover the plain session info by decrypting the encrypted session key.
      * This method returns the decrypted session info as-is (without prefixing missing cipher algorithm),