aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-15 21:02:13 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-15 21:02:13 +0100
commit0fb1772f18e71755ce72a97f18ea2c28cc771aba (patch)
treecf94da462c29e78e37148fa11fec0f2a6cd262fd /src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
parent4a8fa8b498ad7d16cd3ce86bae044f6a6b61f579 (diff)
parenta463f82e3b4b1a01b171d1ae86feb58ab0f96e6d (diff)
Merge pull request #669 from SamWhited/scramcaching
Cache SCRAM-SHA-1 keys for current session
Diffstat (limited to '')
-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 bcc54a26a..f7126a2f9 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);