deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject [2/2] deltaspike git commit: DELTASPIKE-1250 only log out the master.hash index key not the hash itself
Date Tue, 16 May 2017 09:56:32 GMT
DELTASPIKE-1250 only log out the master.hash index key not the hash itself


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0cdede08
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0cdede08
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0cdede08

Branch: refs/heads/master
Commit: 0cdede08c07b0ed791b9018e1ea5281b690728ae
Parents: b41476e
Author: Mark Struberg <struberg@apache.org>
Authored: Tue May 16 11:55:32 2017 +0200
Committer: Mark Struberg <struberg@apache.org>
Committed: Tue May 16 11:55:32 2017 +0200

----------------------------------------------------------------------
 .../apache/deltaspike/core/impl/crypto/DefaultCipherService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0cdede08/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
index 8e5f293..6e01ea6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/crypto/DefaultCipherService.java
@@ -67,7 +67,7 @@ public class DefaultCipherService
 
         if (keys.get(saltKey) != null && !overwrite)
         {
-            throw new IllegalStateException("MasterKey for hash " + saltHash +
+            throw new IllegalStateException("MasterKey for hash " + saltKey +
                 " already exists. Forced overwrite option needed");
         }
 
@@ -75,7 +75,7 @@ public class DefaultCipherService
 
         keys.store(new FileOutputStream(masterFile), null);
 
-        return saltHash;
+        return saltKey;
     }
 
     protected String getMasterKey(String masterSalt)


Mime
View raw message