Merge branch 'pg-refactor-BcUtil-createStreamCipher' into pg-refactor-BcAEADUtil

gefeili · gefeili · commit 46588f7dad5b · 2024-12-03T10:42:50.000+10:30
# Conflicts:
#	pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java
#	pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEDataDecryptorFactory.java
@@ -27,7 +27,7 @@ public class BcPBEDataDecryptorFactory
      * @param pass               the passphrase to use as the primary source of key material.
      * @param calculatorProvider a digest calculator provider to provide calculators to support the key generation calculation required.
      */
-    public BcPBEDataDecryptorFactory(char[] pass, BcPGPDigestCalculatorProvider calculatorProvider)
+    public BcPBEDataDecryptorFactory(char[] pass, PGPDigestCalculatorProvider calculatorProvider)
     {
         super(pass, calculatorProvider);
     }
@@ -51,15 +51,7 @@ public byte[] recoverSessionData(int keyAlgorithm, byte[] key, byte[] secKeyData
             if (secKeyData != null && secKeyData.length > 0)
             {
                 BlockCipher engine = BcImplProvider.createBlockCipher(keyAlgorithm);
-                BufferedBlockCipher cipher = BcUtil.createSymmetricKeyWrapper(false, engine, key, new byte[engine.getBlockSize()]);
-
-                byte[] out = new byte[secKeyData.length];
-
-                int len = cipher.processBytes(secKeyData, 0, secKeyData.length, out, 0);
-
-                len += cipher.doFinal(out, len);
-
-                return out;
+                return BcUtil.processBufferedBlockCipher(false, engine, key, new byte[engine.getBlockSize()], secKeyData, 0, secKeyData.length);
             }
             else
             {
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBEKeyEncryptionMethodGenerator.java
@@ -5,7 +5,6 @@
 import org.bouncycastle.bcpg.S2K;
 import org.bouncycastle.bcpg.SymmetricKeyUtils;
 import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.operator.PBEKeyEncryptionMethodGenerator;
@@ -89,15 +88,7 @@ protected byte[] encryptSessionInfo(int encAlgorithm, byte[] key, byte[] session
         try
         {
             BlockCipher engine = BcImplProvider.createBlockCipher(encAlgorithm);
-            BufferedBlockCipher cipher = BcUtil.createSymmetricKeyWrapper(true, engine, key, new byte[engine.getBlockSize()]);
-
-            byte[] out = new byte[sessionInfo.length];
-
-            int len = cipher.processBytes(sessionInfo, 0, sessionInfo.length, out, 0);
-
-            len += cipher.doFinal(out, len);
-
-            return out;
+            return BcUtil.processBufferedBlockCipher(true, engine, key, new byte[engine.getBlockSize()], sessionInfo, 0, sessionInfo.length);
         }
         catch (InvalidCipherTextException e)
         {
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyDecryptorBuilder.java
@@ -1,6 +1,5 @@
 package org.bouncycastle.openpgp.operator.bc;
 
-import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
@@ -24,14 +23,7 @@ public byte[] recoverKeyData(int encAlgorithm, byte[] key, byte[] iv, byte[] key
             {
                 try
                 {
-                    BufferedBlockCipher c = BcUtil.createSymmetricKeyWrapper(false, BcImplProvider.createBlockCipher(encAlgorithm), key, iv);
-
-                    byte[] out = new byte[keyLen];
-                    int    outLen = c.processBytes(keyData, keyOff, keyLen, out, 0);
-
-                    outLen += c.doFinal(out, outLen);
-
-                    return out;
+                    return BcUtil.processBufferedBlockCipher(false, BcImplProvider.createBlockCipher(encAlgorithm), key, iv, keyData, keyOff, keyLen);
                 }
                 catch (InvalidCipherTextException e)
                 {
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPBESecretKeyEncryptorBuilder.java
@@ -3,7 +3,6 @@
 import java.security.SecureRandom;
 
 import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
@@ -117,15 +116,7 @@ public byte[] encryptKeyData(byte[] key, byte[] iv, byte[] keyData, int keyOff,
 
                         this.random.nextBytes(iv);
                     }
-
-                    BufferedBlockCipher c = BcUtil.createSymmetricKeyWrapper(true, engine, key, iv);
-
-                    byte[] out = new byte[keyLen];
-                    int    outLen = c.processBytes(keyData, keyOff, keyLen, out, 0);
-
-                    outLen += c.doFinal(out, outLen);
-
-                    return out;
+                    return BcUtil.processBufferedBlockCipher(true, engine, key, iv, keyData, keyOff, keyLen);
                 }
                 catch (InvalidCipherTextException e)
                 {
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcUtil.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcUtil.java
@@ -13,6 +13,7 @@
 import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.DefaultBufferedBlockCipher;
+import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.RawAgreement;
 import org.bouncycastle.crypto.ec.CustomNamedCurves;
 import org.bouncycastle.crypto.io.CipherInputStream;
@@ -102,6 +103,21 @@ public static BufferedBlockCipher createSymmetricKeyWrapper(boolean forEncryptio
         return c;
     }
 
+    static byte[] processBufferedBlockCipher(boolean forEncryption, BlockCipher engine, byte[] key, byte[] iv, byte[] msg, int msgOff, int msgLen)
+        throws InvalidCipherTextException
+
+    {
+        BufferedBlockCipher cipher = BcUtil.createSymmetricKeyWrapper(forEncryption, engine, key, iv);
+
+        byte[] out = new byte[msgLen];
+
+        int len = cipher.processBytes(msg, msgOff, msgLen, out, 0);
+
+        len += cipher.doFinal(out, len);
+
+        return out;
+    }
+
     static X9ECParameters getX9Parameters(ASN1ObjectIdentifier curveOID)
     {
         X9ECParameters x9 = CustomNamedCurves.getByOID(curveOID);
diff --git a/pkix/src/test/java/org/bouncycastle/operator/test/AllTests.java b/pkix/src/test/java/org/bouncycastle/operator/test/AllTests.java
@@ -220,6 +220,7 @@ public void testAgainstKnownList()
             new Object[]{BCObjectIdentifiers.sphincsPlus_haraka_256s_r3_simple, "SPHINCS+"},
             new Object[]{BCObjectIdentifiers.sphincsPlus_haraka_256f_r3_simple, "SPHINCS+"},
             new Object[]{GNUObjectIdentifiers.Tiger_192, "Tiger"},
+            new Object[]{PKCSObjectIdentifiers.id_alg_hss_lms_hashsig, "LMS"},
 
             new Object[]{PKCSObjectIdentifiers.RC2_CBC, "RC2/CBC"},
             new Object[]{PKCSObjectIdentifiers.des_EDE3_CBC, "DESEDE-3KEY/CBC"},

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class BcPBEDataDecryptorFactory`
`27`	`27`	`* @param pass the passphrase to use as the primary source of key material.`
`28`	`28`	`* @param calculatorProvider a digest calculator provider to provide calculators to support the key generation calculation required.`
`29`	`29`	`*/`
`30`		`- public BcPBEDataDecryptorFactory(char[] pass, BcPGPDigestCalculatorProvider calculatorProvider)`
	`30`	`+ public BcPBEDataDecryptorFactory(char[] pass, PGPDigestCalculatorProvider calculatorProvider)`
`31`	`31`	`{`
`32`	`32`	`super(pass, calculatorProvider);`
`33`	`33`	`}`
`@@ -51,15 +51,7 @@ public byte[] recoverSessionData(int keyAlgorithm, byte[] key, byte[] secKeyData`
`51`	`51`	`if (secKeyData != null && secKeyData.length > 0)`
`52`	`52`	`{`
`53`	`53`	`BlockCipher engine = BcImplProvider.createBlockCipher(keyAlgorithm);`
`54`		`- BufferedBlockCipher cipher = BcUtil.createSymmetricKeyWrapper(false, engine, key, new byte[engine.getBlockSize()]);`
`55`		`-`
`56`		`- byte[] out = new byte[secKeyData.length];`
`57`		`-`
`58`		`- int len = cipher.processBytes(secKeyData, 0, secKeyData.length, out, 0);`
`59`		`-`
`60`		`- len += cipher.doFinal(out, len);`
`61`		`-`
`62`		`- return out;`
	`54`	`+ return BcUtil.processBufferedBlockCipher(false, engine, key, new byte[engine.getBlockSize()], secKeyData, 0, secKeyData.length);`
`63`	`55`	`}`
`64`	`56`	`else`
`65`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package org.bouncycastle.openpgp.operator.bc;`
`2`	`2`
`3`		`-import org.bouncycastle.crypto.BufferedBlockCipher;`
`4`	`3`	`import org.bouncycastle.crypto.InvalidCipherTextException;`
`5`	`4`	`import org.bouncycastle.openpgp.PGPException;`
`6`	`5`	`import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;`
`@@ -24,14 +23,7 @@ public byte[] recoverKeyData(int encAlgorithm, byte[] key, byte[] iv, byte[] key`
`24`	`23`	`{`
`25`	`24`	`try`
`26`	`25`	`{`
`27`		`- BufferedBlockCipher c = BcUtil.createSymmetricKeyWrapper(false, BcImplProvider.createBlockCipher(encAlgorithm), key, iv);`
`28`		`-`
`29`		`- byte[] out = new byte[keyLen];`
`30`		`- int outLen = c.processBytes(keyData, keyOff, keyLen, out, 0);`
`31`		`-`
`32`		`- outLen += c.doFinal(out, outLen);`
`33`		`-`
`34`		`- return out;`
	`26`	`+ return BcUtil.processBufferedBlockCipher(false, BcImplProvider.createBlockCipher(encAlgorithm), key, iv, keyData, keyOff, keyLen);`
`35`	`27`	`}`
`36`	`28`	`catch (InvalidCipherTextException e)`
`37`	`29`	`{`