relates to #1228 - simplified use of PGPSessionKeyEncryptedData

Author: dghgit

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

@@ -191,11 +191,10 @@ public Iterator<PGPEncryptedData> iterator()
      * Create a decryption method using a {@link PGPSessionKey}. This method can be used to decrypt messages which do not
      * contain a SKESK or PKESK packet using a session key.
      *
-     * @param sessionKey session key for message decryption
      * @return session key encrypted data
      */
-    public PGPSessionKeyEncryptedData makeSessionKeyEncryptedData(PGPSessionKey sessionKey)
+    public PGPSessionKeyEncryptedData extractSessionKeyEncryptedData()
     {
-        return new PGPSessionKeyEncryptedData(sessionKey, data);
+        return new PGPSessionKeyEncryptedData(data);
     }
 }

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

@@ -112,6 +112,9 @@ public InputStream getDataStream(
         }
     }
 
+    /**
+     * @deprecated will be removed in 1.74, use PGPEncryptedDataList.extractSessionKeyEncryptedData() and then apply the dataDecryptorFactory.
+     */
     public InputStream getDataStream(
         SessionKeyDataDecryptorFactory dataDecryptorFactory)
         throws PGPException

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

@@ -108,6 +108,9 @@ public InputStream getDataStream(
         return getDataStream(dataDecryptorFactory, getSessionKey(dataDecryptorFactory));
     }
 
+    /**
+     * @deprecated will be removed in 1.74, use PGPEncryptedDataList.extractSessionKeyEncryptedData() and then apply the dataDecryptorFactory.
+     */
     public InputStream getDataStream(
         SessionKeyDataDecryptorFactory dataDecryptorFactory)
         throws PGPException

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

@@ -5,15 +5,18 @@
 import org.bouncycastle.bcpg.InputStreamPacket;
 import org.bouncycastle.openpgp.operator.SessionKeyDataDecryptorFactory;
 
+/**
+ * The basis of PGP encrypted data - encrypted data encrypted using a symmetric session key.
+ */
 public class PGPSessionKeyEncryptedData
     extends PGPSymmetricEncryptedData
 {
     private final PGPSessionKey sessionKey;
 
-    PGPSessionKeyEncryptedData(PGPSessionKey sessionKey, InputStreamPacket encData)
+    PGPSessionKeyEncryptedData(InputStreamPacket encData)
     {
         super(encData);
-        this.sessionKey = sessionKey;
+        this.sessionKey = null;
     }
 
     @Override

pg/src/test/java/org/bouncycastle/openpgp/test/PGPSessionKeyTest.java

@@ -214,10 +214,9 @@ private void verifyJcePBEDecryptorFactoryFromSessionKeyCanDecryptDataSuccessfull
 
         PGPObjectFactory objectFactory = new BcPGPObjectFactory(msgArmorIn);
         PGPEncryptedDataList encryptedDataList = (PGPEncryptedDataList)objectFactory.nextObject();
-        PGPPBEEncryptedData encryptedData = (PGPPBEEncryptedData)encryptedDataList.iterator().next();
+        PGPSessionKeyEncryptedData encryptedData = encryptedDataList.extractSessionKeyEncryptedData();
 
-        SessionKeyDataDecryptorFactory decryptorFactory = new JceSessionKeyDataDecryptorFactoryBuilder().build(
-            new PGPSessionKey(PBE_ENC_SESSIONKEY_ALG, Hex.decode(PBE_ENC_SESSIONKEY)));
+        SessionKeyDataDecryptorFactory decryptorFactory = new JceSessionKeyDataDecryptorFactoryBuilder().build(new PGPSessionKey(PBE_ENC_SESSIONKEY_ALG, Hex.decode(PBE_ENC_SESSIONKEY)));
         InputStream decrypted = encryptedData.getDataStream(decryptorFactory);
 
         objectFactory = new BcPGPObjectFactory(decrypted);
@@ -292,9 +291,10 @@ private void decryptMessageWithoutEskUsingSessionKey()
         isEquals(0, encryptedData.size()); // there is no encrypted session key packet
 
         // Add decryption method using a session key
-        PGPSessionKeyEncryptedData sessionKeyEncData = encryptedData.makeSessionKeyEncryptedData(sessionKey);
+        PGPSessionKeyEncryptedData sessionKeyEncData = encryptedData.extractSessionKeyEncryptedData();
 
         SessionKeyDataDecryptorFactory decryptorFactory = new BcSessionKeyDataDecryptorFactory(sessionKey);
+
         InputStream decrypted = sessionKeyEncData.getDataStream(decryptorFactory);
 
         objectFactory = new BcPGPObjectFactory(decrypted);