diff options
| author |  Vitaly Takmazov | 2016-06-06 14:58:11 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-06-06 14:58:11 +0300 |
| commit | e7e9bed758028e1555c9cbbcaaa29fe5504db280 (patch) | |
| tree | 21145eab47562005ca02d5c75b8fdae4dd545300 /src/main/java | |
| parent | e31024bb7cef19c2a783b5f728a8c0cfe6a9925a (diff) | |
update xmpp library
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/juick/CrosspostComponent.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/juick/xmpp/s2s/ConnectionRouter.java | 4 |
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 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(); |