2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/juick/CrosspostComponent.java b/src/main/java/com/juick/CrosspostComponent.java
index c277ee681..d5f13ab2d 100644
--- a/src/main/java/com/juick/CrosspostComponent.java
+++ b/src/main/java/com/juick/CrosspostComponent.java
@@ -23,7 +23,7 @@ import com.juick.xmpp.Message;
 import com.juick.xmpp.Stream;
 import com.juick.xmpp.StreamComponent;
 import com.juick.xmpp.extensions.JuickMessage;
-import com.juick.xmpp.utils.Base64;
+import org.apache.commons.codec.binary.Base64;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -307,7 +307,7 @@ public class CrosspostComponent implements ServletContextListener,  Stream.Strea
             Mac mac = Mac.getInstance("HmacSHA1");
             mac.init(signingKey);
             byte[] rawHmac = mac.doFinal(base.getBytes());
-            return Base64.encode(rawHmac);
+            return Base64.encodeBase64String(rawHmac);
 
         } catch (Exception e) {
             logger.log(Level.SEVERE, "twitterSignature: " + e.getMessage(), e);
diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionRouter.java b/src/main/java/com/juick/xmpp/s2s/ConnectionRouter.java
index 2a1fed5d9..61ae89e0b 100644
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionRouter.java
+++ b/src/main/java/com/juick/xmpp/s2s/ConnectionRouter.java
@@ -7,8 +7,8 @@ import com.juick.xmpp.Message;
 import com.juick.xmpp.extensions.JuickMessage;
 import com.juick.xmpp.extensions.Nickname;
 import com.juick.xmpp.extensions.XOOB;
-import com.juick.xmpp.utils.SHA1;
 import com.juick.xmpp.utils.XmlUtils;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.IOException;
@@ -50,7 +50,7 @@ public class ConnectionRouter extends Connection implements Runnable {
                 throw new Exception("FAIL ON FIRST PACKET");
             }
 
-            msg = "<handshake>" + SHA1.encode(streamID + "secret") + "</handshake>";
+            msg = "<handshake>" + DigestUtils.sha1Hex(streamID + "secret") + "</handshake>";
             writer.write(msg);
             writer.flush();