Skip to content

Replace insecure cipher modes with AES/GCM in benchmark test files #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sonarqube-agent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace insecure cipher modes with AES/GCM in benchmark test files #52

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00125.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
// (byte)0x44, (byte)0x21, (byte)0xC3, (byte)0xC3033
// };
java.security.SecureRandom random = new java.security.SecureRandom();
byte[] iv = random.generateSeed(8); // DES requires 8 byte keys
byte[] iv = random.generateSeed(12); // DES requires 8 byte keys

try {
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance("DES/CBC/PKCS5Padding");
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance("AES/GCM/NoPadding");

// Prepare the cipher to encrypt
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("DES").generateKey();
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("AES").generateKey();
java.security.spec.AlgorithmParameterSpec paramSpec =
new javax.crypto.spec.IvParameterSpec(iv);
new javax.crypto.spec.GCMParameterSpec(128, iv);
c.init(javax.crypto.Cipher.ENCRYPT_MODE, key, paramSpec);

// encrypt and store the results
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest00781.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
// (byte)0x44, (byte)0x21, (byte)0xC3, (byte)0xC3033
// };
java.security.SecureRandom random = new java.security.SecureRandom();
byte[] iv = random.generateSeed(8); // DES requires 8 byte keys
byte[] iv = random.generateSeed(12); // DES requires 8 byte keys

try {
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance("DES/CBC/PKCS5Padding");
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance("AES/GCM/NoPadding");

// Prepare the cipher to encrypt
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("DES").generateKey();
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("AES").generateKey();
java.security.spec.AlgorithmParameterSpec paramSpec =
new javax.crypto.spec.IvParameterSpec(iv);
new javax.crypto.spec.GCMParameterSpec(128, iv);
c.init(javax.crypto.Cipher.ENCRYPT_MODE, key, paramSpec);

// encrypt and store the results
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest01107.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
java.util.Properties benchmarkprops = new java.util.Properties();
benchmarkprops.load(
this.getClass().getClassLoader().getResourceAsStream("benchmark.properties"));
String algorithm = benchmarkprops.getProperty("cryptoAlg1", "DESede/ECB/PKCS5Padding");
String algorithm = benchmarkprops.getProperty("cryptoAlg1", "AES/GCM/NoPadding");
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance(algorithm);

// Prepare the cipher to encrypt
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("DES").generateKey();
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("AES").generateKey();
c.init(javax.crypto.Cipher.ENCRYPT_MODE, key);

// encrypt and store the results
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest02295.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
// (byte)0x44, (byte)0x21, (byte)0xC3, (byte)0xC3033
// };
java.security.SecureRandom random = new java.security.SecureRandom();
byte[] iv = random.generateSeed(8); // DES requires 8 byte keys
byte[] iv = random.generateSeed(12); // DES requires 8 byte keys

try {
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance("DES/CBC/PKCS5Padding");
javax.crypto.Cipher c = javax.crypto.Cipher.getInstance("AES/GCM/NoPadding");

// Prepare the cipher to encrypt
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("DES").generateKey();
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("AES").generateKey();
java.security.spec.AlgorithmParameterSpec paramSpec =
new javax.crypto.spec.IvParameterSpec(iv);
new javax.crypto.spec.GCMParameterSpec(128, iv);
c.init(javax.crypto.Cipher.ENCRYPT_MODE, key, paramSpec);

// encrypt and store the results
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/owasp/benchmark/testcode/BenchmarkTest02658.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
// (byte)0x44, (byte)0x21, (byte)0xC3, (byte)0xC3033
// };
java.security.SecureRandom random = new java.security.SecureRandom();
byte[] iv = random.generateSeed(8); // DES requires 8 byte keys
byte[] iv = random.generateSeed(12); // DES requires 8 byte keys

try {
javax.crypto.Cipher c =
javax.crypto.Cipher.getInstance(
"DES/CBC/PKCS5PADDING", java.security.Security.getProvider("SunJCE"));
"AES/GCM/NoPadding", java.security.Security.getProvider("SunJCE"));

// Prepare the cipher to encrypt
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("DES").generateKey();
javax.crypto.SecretKey key = javax.crypto.KeyGenerator.getInstance("AES").generateKey();
java.security.spec.AlgorithmParameterSpec paramSpec =
new javax.crypto.spec.IvParameterSpec(iv);
new javax.crypto.spec.GCMParameterSpec(128, iv);
c.init(javax.crypto.Cipher.ENCRYPT_MODE, key, paramSpec);

// encrypt and store the results
Expand Down