From 3c4ccd978c1f1923b7fa8e7027ce58988562ffcd Mon Sep 17 00:00:00 2001 From: Enri Ozuni Date: Sun, 3 May 2020 23:54:00 +0200 Subject: [PATCH 1/2] Fixed typo in password hasher template Signed-off-by: Enri Ozuni --- .../crysl/templates/securepassword/PasswordHasher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/de.cognicrypt.codegenerator/src/main/java/de/cognicrypt/codegenerator/crysl/templates/securepassword/PasswordHasher.java b/plugins/de.cognicrypt.codegenerator/src/main/java/de/cognicrypt/codegenerator/crysl/templates/securepassword/PasswordHasher.java index 5a6cc23d9..74e904ce8 100644 --- a/plugins/de.cognicrypt.codegenerator/src/main/java/de/cognicrypt/codegenerator/crysl/templates/securepassword/PasswordHasher.java +++ b/plugins/de.cognicrypt.codegenerator/src/main/java/de/cognicrypt/codegenerator/crysl/templates/securepassword/PasswordHasher.java @@ -36,7 +36,7 @@ public static boolean verifyPWHash(char[] pwd, java.lang.String pwdhash) throws byte[] res = null; int keysize = 160; - CrySLCodeGenerator.getInstance().includeClass("java.security.PBEKeySpec").addParameter(pwd, "password").addParameter(salt, "salt").addParameter(keysize, "keylength") + CrySLCodeGenerator.getInstance().includeClass("java.security.SecureRandom").addParameter(salt, "next").includeClass("java.security.PBEKeySpec").addParameter(pwd, "password").addParameter(salt, "salt").addParameter(keysize, "keylength") .includeClass("javax.crypto.SecretKeyFactory").includeClass("java.security.SecretKey").addReturnObject(res).generate(); Boolean areEqual = slowEquals(res, fromBase64(parts[1])); From c5c0cc73a96d75260d3fa928b8bff294a892cd3b Mon Sep 17 00:00:00 2001 From: Enri Ozuni Date: Sun, 3 May 2020 23:55:12 +0200 Subject: [PATCH 2/2] Updated CrySLCodeGenTest Signed-off-by: Enri Ozuni --- .../codegenerator/generator/test/CrySLCodeGenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CrySLCodeGenTest.java b/plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CrySLCodeGenTest.java index ad2f70a6c..644c1ff6e 100644 --- a/plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CrySLCodeGenTest.java +++ b/plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CrySLCodeGenTest.java @@ -308,7 +308,7 @@ public void generateSecPwd() { TestUtils.openJavaFileInWorkspace(developerProject, Constants.PackageName, encClassUnit); assertEquals(5, TestUtils.countMethods(encClassUnit)); assertEquals(12, TestUtils.countStatements(encClassUnit, "createPWHash")); - assertEquals(11, TestUtils.countStatements(encClassUnit, "verifyPWHash")); + assertEquals(13, TestUtils.countStatements(encClassUnit, "verifyPWHash")); } catch (JavaModelException e) { Activator.getDefault().logError(e, "Could not create Java class in test project.");