From 70f9db34cb1a9b0dafbf985e9a590cb73528e598 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 20 Jan 2015 07:47:34 +0530 Subject: [PATCH] CID 1264632: Rely on a known and widely available encoding UTF8 Signed-off-by: Rohit Yadav (cherry picked from commit 0763b5576dde92b1c4ecfbce3b3b593ed0ca90bc) Signed-off-by: Rohit Yadav --- utils/src/com/cloud/utils/ConstantTimeComparator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java b/utils/src/com/cloud/utils/ConstantTimeComparator.java index 4d4a595309a..baf2bc2738f 100644 --- a/utils/src/com/cloud/utils/ConstantTimeComparator.java +++ b/utils/src/com/cloud/utils/ConstantTimeComparator.java @@ -19,6 +19,8 @@ package com.cloud.utils; +import java.nio.charset.Charset; + public class ConstantTimeComparator { public static boolean compareBytes(byte[] b1, byte[] b2) { @@ -34,6 +36,7 @@ public class ConstantTimeComparator { } public static boolean compareStrings(String s1, String s2) { - return compareBytes(s1.getBytes(), s2.getBytes()); + final Charset encoding = Charset.forName("UTF-8"); + return compareBytes(s1.getBytes(encoding), s2.getBytes(encoding)); } }