diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-26 12:54:56 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-26 12:54:56 +1300 |
commit | fbdd359d223579173b4e0076563df296f5492e3c (patch) | |
tree | faacb0f61e284d17f942cb73d3a85f0dd3496d28 /src/org/traccar/helper/Hashing.java | |
parent | d938e1e4d8d54fec6aab26246b6b804d34addf66 (diff) | |
download | trackermap-server-fbdd359d223579173b4e0076563df296f5492e3c.tar.gz trackermap-server-fbdd359d223579173b4e0076563df296f5492e3c.tar.bz2 trackermap-server-fbdd359d223579173b4e0076563df296f5492e3c.zip |
Rename hex conversion methods
Diffstat (limited to 'src/org/traccar/helper/Hashing.java')
-rw-r--r-- | src/org/traccar/helper/Hashing.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/helper/Hashing.java b/src/org/traccar/helper/Hashing.java index 1f01d9102..cdc5c7ae5 100644 --- a/src/org/traccar/helper/Hashing.java +++ b/src/org/traccar/helper/Hashing.java @@ -65,13 +65,13 @@ public final class Hashing { RANDOM.nextBytes(salt); byte[] hash = function(password.toCharArray(), salt); return new HashingResult( - ChannelBufferTools.convertByteArray(hash), - ChannelBufferTools.convertByteArray(salt)); + ChannelBufferTools.bytesToHex(hash), + ChannelBufferTools.bytesToHex(salt)); } public static boolean validatePassword(String password, String hashHex, String saltHex) { - byte[] hash = ChannelBufferTools.convertHexString(hashHex); - byte[] salt = ChannelBufferTools.convertHexString(saltHex); + byte[] hash = ChannelBufferTools.hexToBytes(hashHex); + byte[] salt = ChannelBufferTools.hexToBytes(saltHex); return slowEquals(hash, function(password.toCharArray(), salt)); } |