diff options
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/helper/ChannelBufferTools.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/helper/Hashing.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/helper/ChannelBufferTools.java b/src/org/traccar/helper/ChannelBufferTools.java index d8d74b6ea..99da43b54 100644 --- a/src/org/traccar/helper/ChannelBufferTools.java +++ b/src/org/traccar/helper/ChannelBufferTools.java @@ -89,7 +89,7 @@ public final class ChannelBufferTools { return value; } - public static byte[] convertHexString(String in) { + public static byte[] hexToBytes(String in) { int count = in.length() / 2; byte[] out = new byte[count]; for (int i = 0; i < count; i++) { @@ -98,7 +98,7 @@ public final class ChannelBufferTools { return out; } - public static String convertByteArray(byte[] in) { + public static String bytesToHex(byte[] in) { StringBuilder out = new StringBuilder(); Formatter formatter = new Formatter(out); for (byte b : in) { 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)); } |