Merge branch 'pgpainless-fixDirectS2K'

Author: dghgit

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

@@ -229,7 +229,14 @@ else if (directS2K)
         for (int i = 0; i < methods.size(); i++)
         {
             PGPKeyEncryptionMethodGenerator method = (PGPKeyEncryptionMethodGenerator)methods.get(i);
-            pOut.writePacket(method.generate(dataEncryptorBuilder, sessionKey));
+            if (directS2K)
+            {
+                pOut.writePacket(method.generate(dataEncryptorBuilder, null));
+            }
+            else
+            {
+                pOut.writePacket(method.generate(dataEncryptorBuilder, sessionKey));
+            }
         }
         try
         {