aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------deps/com.juick.xmpp0
-rw-r--r--src/main/java/com/juick/CrosspostComponent.java4
-rw-r--r--src/main/java/com/juick/xmpp/s2s/ConnectionRouter.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/deps/com.juick.xmpp b/deps/com.juick.xmpp
-Subproject 8ea3766e846f6477e7e2bbdc9dd7ebed0113dc7
+Subproject 34376f06b21627cb3b62c649cf723813d3f4518
diff --git a/src/main/java/com/juick/CrosspostComponent.java b/src/main/java/com/juick/CrosspostComponent.java
index c277ee68..d5f13ab2 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 2a1fed5d..61ae89e0 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();