diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2020-07-07 14:46:47 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2020-07-07 14:46:47 +0200 |
commit | 0d76368b681d439e3c044a772a858556cf6d8a24 (patch) | |
tree | 26d95a68c26cc1f4ecb6e47cdb471585226daa37 /id | |
parent | 10692d7ab188f030a7407a7278eeebbb14979446 (diff) | |
download | moa-id-spss-0d76368b681d439e3c044a772a858556cf6d8a24.tar.gz moa-id-spss-0d76368b681d439e3c044a772a858556cf6d8a24.tar.bz2 moa-id-spss-0d76368b681d439e3c044a772a858556cf6d8a24.zip |
Revert "update Cache encryption layer"
This reverts commit 132d79f5b4dca0beb10743a81899c8afa09913f9.
Diffstat (limited to 'id')
-rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AbstractEncrytionUtil.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AbstractEncrytionUtil.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AbstractEncrytionUtil.java index d3a9486b0..8fdf1eab8 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AbstractEncrytionUtil.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AbstractEncrytionUtil.java @@ -72,7 +72,7 @@ public abstract class AbstractEncrytionUtil { PBEKeySpec keySpec = new PBEKeySpec(key.toCharArray()); SecretKeyFactory factory = SecretKeyFactory.getInstance("PKCS#5", "IAIK"); - SecretKey pbeKey = factory.generateSecret(keySpec); + PBEKey pbeKey = (PBEKey)factory.generateSecret(keySpec); SecureRandom random = new SecureRandom(); KeyGenerator pbkdf2 = KeyGenerator.getInstance("PBKDF2", "IAIK"); @@ -82,7 +82,7 @@ public abstract class AbstractEncrytionUtil { salt.getBytes(), 2000, 16); - + pbkdf2.init(parameterSpec, random); SecretKey derivedKey = pbkdf2.generateKey(); |