diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-10 16:23:06 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-10 16:23:06 +1300 |
commit | a58b40a49e96f8fc876b88b6b10489f8532893d9 (patch) | |
tree | 4ed73b40eda9b3c560d3a10519ee210461d2c5ae /src/org/traccar/helper/Hashing.java | |
parent | 4d7c36cbd2ec7f6e7d971f4de013603d4cb80d0e (diff) | |
download | trackermap-server-a58b40a49e96f8fc876b88b6b10489f8532893d9.tar.gz trackermap-server-a58b40a49e96f8fc876b88b6b10489f8532893d9.tar.bz2 trackermap-server-a58b40a49e96f8fc876b88b6b10489f8532893d9.zip |
Replace deprecated classes
Diffstat (limited to 'src/org/traccar/helper/Hashing.java')
-rw-r--r-- | src/org/traccar/helper/Hashing.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/org/traccar/helper/Hashing.java b/src/org/traccar/helper/Hashing.java index 3fcc124fa..e91310eda 100644 --- a/src/org/traccar/helper/Hashing.java +++ b/src/org/traccar/helper/Hashing.java @@ -17,7 +17,6 @@ package org.traccar.helper; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; -import javax.xml.bind.DatatypeConverter; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.spec.InvalidKeySpecException; @@ -75,13 +74,13 @@ public final class Hashing { RANDOM.nextBytes(salt); byte[] hash = function(password.toCharArray(), salt); return new HashingResult( - DatatypeConverter.printHexBinary(hash), - DatatypeConverter.printHexBinary(salt)); + DataConverter.printHex(hash), + DataConverter.printHex(salt)); } public static boolean validatePassword(String password, String hashHex, String saltHex) { - byte[] hash = DatatypeConverter.parseHexBinary(hashHex); - byte[] salt = DatatypeConverter.parseHexBinary(saltHex); + byte[] hash = DataConverter.parseHex(hashHex); + byte[] salt = DataConverter.parseHex(saltHex); return slowEquals(hash, function(password.toCharArray(), salt)); } |