keep chacha20 usage separate from poly1305 (combined algorithm in JCE

seems to be buggy, using it together as separate algorithms seems to work fine)
invesdwin · Jan 27, 2023 · b13e220 · b13e220
1 parent a8b9416
commit b13e220
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/...dwin/context/security/crypto/encryption/cipher/symmetric/algorithm/ChaCha20Algorithm.java b/...dwin/context/security/crypto/encryption/cipher/symmetric/algorithm/ChaCha20Algorithm.java
@@ -22,9 +22,6 @@
  */
 @Immutable
 public enum ChaCha20Algorithm implements ISymmetricCipherAlgorithm {
-    /**
-     * Encryption only
-     */
     ChaCha20("ChaCha20", 12, 0) {
         @Override
         public AlgorithmParameterSpec wrapParam(final byte[] iv) {
@@ -35,25 +32,9 @@ public AlgorithmParameterSpec wrapParam(final byte[] iv) {
         public AlgorithmParameterSpec wrapParam(final MutableIvParameterSpec iv) {
             return wrapParam(iv.getIV());
         }
-    },
-    /**
-     * Authenticated Encryption
-     * 
-     * https://mkyong.com/java/java-11-chacha20-poly1305-encryption-examples/
-     */
-    ChaCha20_Poly1305("ChaCha20-Poly1305", 12, 16) {
-        @Override
-        public AlgorithmParameterSpec wrapParam(final byte[] iv) {
-            return new MutableIvParameterSpec(iv);
-        }
-
-        @Override
-        public AlgorithmParameterSpec wrapParam(final MutableIvParameterSpec iv) {
-            return iv;
-        }
     };
 
-    public static final ChaCha20Algorithm DEFAULT = ChaCha20_Poly1305;
+    public static final ChaCha20Algorithm DEFAULT = ChaCha20;
 
     private final String algorithm;
     private final int ivSize;

diff --git a/...vesdwin/context/security/crypto/encryption/cipher/hybrid/HybridEncryptionFactoryTest.java b/...vesdwin/context/security/crypto/encryption/cipher/hybrid/HybridEncryptionFactoryTest.java
@@ -96,9 +96,9 @@ public void testCipher() {
         random.nextBytes(key);
         derivedKeyProvider = DerivedKeyProvider
                 .fromRandom(AsymmetricEncryptionFactoryTest.class.getSimpleName().getBytes(), key);
-        final byte[] cipherKey = derivedKeyProvider.newDerivedKey("cipher-key".getBytes(),
-                AesKeySize.DEFAULT.getBits());
         for (final ISymmetricCipherAlgorithm symmetricAlgorithm : ISymmetricCipherAlgorithm.values()) {
+            final byte[] cipherKey = derivedKeyProvider.newDerivedKey("cipher-key".getBytes(),
+                    symmetricAlgorithm.getDefaultKeySizeBits());
             final CipherDerivedIV derivedIV = new CipherDerivedIV(symmetricAlgorithm, derivedKeyProvider);
             final CipherCountedIV countedIV = new CipherCountedIV(symmetricAlgorithm);
             final CipherPresharedIV presharedIV = new CipherPresharedIV(symmetricAlgorithm, derivedKeyProvider