From 4d9b066060bd78243616cb6f1fbdf0d06b09cbe7 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 5 Dec 2016 11:47:09 +0300
Subject: juick-xmpp: dialback refactoring

---
 .../java/com/juick/components/s2s/Connection.java    | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java b/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
index 4a39ffb5..67953b76 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
@@ -1,14 +1,15 @@
 package com.juick.components.s2s;
 
 import com.juick.components.XMPPServer;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.codec.digest.HmacUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlpull.mxp1.MXParser;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
@@ -117,21 +118,6 @@ public class Connection {
         }
     }
 
-    static String generateDialbackKey(String to, String from, String id) throws Exception {
-        Mac hmacSha256 = Mac.getInstance("hmacSHA256");
-
-        SecretKeySpec secret_key = new SecretKeySpec("$UppPerSeCCret4".getBytes(), "SHA-256");
-        hmacSha256.init(secret_key);
-        byte key[] = hmacSha256.doFinal((to + " " + from + " " + id).getBytes());
-
-        StringBuilder hexkey = new StringBuilder();
-        for (int i = 0; i < key.length; i++) {
-            hexkey.append(Integer.toHexString(0xFF & key[i]));
-        }
-
-        return hexkey.toString();
-    }
-
     public boolean isSecured() {
         return secured;
     }
-- 
cgit v1.2.3