Skip to content
This repository was archived by the owner on Nov 24, 2024. It is now read-only.

Fix code scanning alert no. 5: Use of a broken or risky cryptographic algorithm #47

Closed
wants to merge 1 commit into from
Closed

Fix code scanning alert no. 5: Use of a broken or risky cryptographic algorithm #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/main/java/org/codehaus/plexus/components/cipher/internal/PBECipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one
import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.GCMParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;

Expand All @@ -49,7 +49,7 @@ public class PBECipher {
protected static final int SALT_SIZE = 8;
protected static final int CHUNK_SIZE = 16;
protected static final String KEY_ALG = "AES";
protected static final String CIPHER_ALG = "AES/CBC/PKCS5Padding";
protected static final String CIPHER_ALG = "AES/GCM/NoPadding";
protected static final int PBE_ITERATIONS = 310000;
private static final SecureRandom _secureRandom = new SecureRandom();

Expand Down Expand Up @@ -84,7 +84,8 @@ public String encrypt64(final String clearText, final String password) throws Pl

allEncryptedBytes[SALT_SIZE] = padLen;

System.arraycopy(encryptedBytes, 0, allEncryptedBytes, SALT_SIZE + 1, len);
System.arraycopy(iv, 0, allEncryptedBytes, SALT_SIZE + 1, iv.length);
System.arraycopy(encryptedBytes, 0, allEncryptedBytes, SALT_SIZE + 1 + iv.length, len);

return Base64.getEncoder().encodeToString(allEncryptedBytes);
} catch (Exception e) {
Expand All @@ -105,9 +106,12 @@ public String decrypt64(final String encryptedText, final String password) throw

byte padLen = allEncryptedBytes[SALT_SIZE];

byte[] encryptedBytes = new byte[totalLen - SALT_SIZE - 1 - padLen];
byte[] iv = new byte[12]; // GCM standard nonce size
System.arraycopy(allEncryptedBytes, SALT_SIZE + 1, iv, 0, iv.length);

System.arraycopy(allEncryptedBytes, SALT_SIZE + 1, encryptedBytes, 0, encryptedBytes.length);
byte[] encryptedBytes = new byte[totalLen - SALT_SIZE - 1 - iv.length];

System.arraycopy(allEncryptedBytes, SALT_SIZE + 1 + iv.length, encryptedBytes, 0, encryptedBytes.length);

Cipher cipher = createCipher(password.toCharArray(), salt, Cipher.DECRYPT_MODE);

Expand All @@ -129,15 +133,15 @@ private Cipher createCipher(final char[] pwd, byte[] salt, final int mode)

byte[] key = new byte[SPICE_SIZE];

byte[] iv = new byte[SPICE_SIZE];
byte[] iv = new byte[12]; // GCM standard nonce size
_secureRandom.nextBytes(iv); // Generate a random nonce

System.arraycopy(keyAndIv, 0, key, 0, key.length);

System.arraycopy(keyAndIv, key.length, iv, 0, iv.length);

Cipher cipher = Cipher.getInstance(CIPHER_ALG);

cipher.init(mode, new SecretKeySpec(key, KEY_ALG), new IvParameterSpec(iv));
GCMParameterSpec gcmSpec = new GCMParameterSpec(128, iv); // 128-bit authentication tag length
cipher.init(mode, new SecretKeySpec(key, KEY_ALG), gcmSpec);

return cipher;
}
Expand Down
Loading