Minor changes in PBEKeyEncryptionMethodGenerator, remove unused functions in PublicKeyKeyEncryptionMethodGenerator.

Author: gefeili

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

@@ -231,9 +231,8 @@ public ContainedPacket generateV6(int kekAlgorithm, int aeadAlgorithm, byte[] se
         byte[] iv = new byte[AEADUtils.getIVLength(aeadAlgorithm)];
         random.nextBytes(iv);
 
-        byte[] sk = new byte[sessionInfo.length - 3];
-        System.arraycopy(sessionInfo, 1, sk, 0, sk.length);
         int tagLen = AEADUtils.getAuthTagLength(aeadAlgorithm);
+        byte[] sk = getSessionKey(sessionInfo);
         byte[] eskAndTag = getEskAndTag(kekAlgorithm, aeadAlgorithm, sk, kek, iv, info);
         byte[] esk = Arrays.copyOfRange(eskAndTag, 0, eskAndTag.length - tagLen);
         byte[] tag = Arrays.copyOfRange(eskAndTag, esk.length, eskAndTag.length);

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

@@ -216,10 +216,10 @@ protected static byte[] concatECDHEphKeyWithWrappedSessionKey(byte[] ephPubEncod
         return out;
     }
 
-    private static byte[] getSessionInfo(byte[] ephPubEncoding, int symmetricKeyAlgorithm, byte[] c)
-    {
-        return getSessionInfo(ephPubEncoding, new byte[]{(byte) symmetricKeyAlgorithm}, c);
-    }
+//    private static byte[] getSessionInfo(byte[] ephPubEncoding, int symmetricKeyAlgorithm, byte[] c)
+//    {
+//        return getSessionInfo(ephPubEncoding, new byte[]{(byte) symmetricKeyAlgorithm}, c);
+//    }
 
     protected static byte[] getSessionInfo(byte[] ephPubEncoding, byte[] optSymKeyAlgorithm, byte[] wrappedSessionKey)
     {

pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java

@@ -328,7 +328,7 @@ private byte[] encryptSessionInfoWithECDHKey(byte[] sessionInfo,
     private byte[] encryptV3SessionInfoWithX25519X448Key(PublicKeyPacket pubKeyPacket, byte[] sessionInfo, int hashAlgorithm, int symmetricKeyAlgorithm, String algorithmName,
                                                          AsymmetricCipherKeyPairGenerator gen, KeyGenerationParameters parameters, RawAgreement agreement, AsymmetricKeyParameter cryptoPublicKey,
                                                          int keySize, EphPubEncodingOperation ephPubEncodingOperation)
-        throws PGPException, IOException
+        throws PGPException
     {
         AsymmetricCipherKeyPair ephKp = getAsymmetricCipherKeyPair(gen, parameters);
         byte[] secret = BcUtil.getSecret(agreement, ephKp.getPrivate(), cryptoPublicKey);