aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-15 12:57:36 -0500
committerSam Whited <sam@samwhited.com>2014-11-15 12:57:36 -0500
commita463f82e3b4b1a01b171d1ae86feb58ab0f96e6d (patch)
tree838d8a588bb72c12b5325cfecaf6816ef3ad9055 /src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
parent69ab8a2adbcaaaea3cbb9916ab0273d59f40c778 (diff)
Cache SCRAM-SHA-1 keys for current session
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/CryptoHelper.java')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/CryptoHelper.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index bcc54a26..f7126a2f 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -30,6 +30,10 @@ public class CryptoHelper {
return array;
}
+ public static String hexToString(final String hexString) {
+ return new String(hexToBytes(hexString));
+ }
+
public static byte[] concatenateByteArrays(byte[] a, byte[] b) {
byte[] result = new byte[a.length + b.length];
System.arraycopy(a, 0, result, 0, a.length);