diff --git a/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar b/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar index 9d39bc7..b20b258 100644 Binary files a/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar and b/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar differ diff --git a/install/fr-plugin-DataEncryptor-1.0.zip b/install/fr-plugin-DataEncryptor-1.0.zip index e5c2214..3e250b4 100644 Binary files a/install/fr-plugin-DataEncryptor-1.0.zip and b/install/fr-plugin-DataEncryptor-1.0.zip differ diff --git a/src/com/fr/plugin/data/encrypt/FunConstants.java b/src/com/fr/plugin/data/encrypt/FunConstants.java index b0d8b0d..119ad8d 100644 --- a/src/com/fr/plugin/data/encrypt/FunConstants.java +++ b/src/com/fr/plugin/data/encrypt/FunConstants.java @@ -78,7 +78,7 @@ public class FunConstants { } } - final static SimpleStringPBEConfig getSimpleStringPBEConfig(String secretKey,String algorithm) { + final static SimpleStringPBEConfig GetSimpleStringPBEConfig(String secretKey, String algorithm) { SimpleStringPBEConfig config = new SimpleStringPBEConfig(); config.setPassword(secretKey); config.setPoolSize("1"); @@ -86,15 +86,15 @@ public class FunConstants { config.setAlgorithm(algorithm); config.setKeyObtentionIterations("1000"); config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); - config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); +// config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); +// config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); config.setStringOutputType("base64"); return config; } final static String EncryptData(String secretKey, String message,String algorithm, boolean isEncrypt){ PooledPBEStringEncryptor pooledPBEStringEncryptor = new PooledPBEStringEncryptor(); - pooledPBEStringEncryptor.setConfig(getSimpleStringPBEConfig(secretKey,algorithm)); + pooledPBEStringEncryptor.setConfig(GetSimpleStringPBEConfig(secretKey,algorithm)); String result = isEncrypt ? pooledPBEStringEncryptor.encrypt(message) : pooledPBEStringEncryptor.decrypt(message); return result; }