Merge pull request #271 from pusher/dev-fix-lazysodium-5

swap lazsysodium for tweetnacl

Author: daniellevass

build.gradle

@@ -47,9 +47,6 @@ dependencies {
 	compile "com.google.code.gson:gson:2.2.2"
 	compile "org.java-websocket:Java-WebSocket:1.4.0"
 
-	implementation "com.goterl.lazycode:lazysodium-java:4.2.6"
-	implementation "net.java.dev.jna:jna:5.5.0"
-
 	testCompile "org.mockito:mockito-all:1.8.5"
 	testCompile "org.powermock:powermock-module-junit4:1.4.11"
 	testCompile "org.powermock:powermock-api-mockito:1.4.11"

src/main/java/com/pusher/client/crypto/nacl/SecretBoxOpener.java

@@ -24,13 +24,6 @@ a copy of this software and associated documentation files (the "Software"),
 
 package com.pusher.client.crypto.nacl;
 
-import com.goterl.lazycode.lazysodium.LazySodiumJava;
-import com.goterl.lazycode.lazysodium.SodiumJava;
-import com.goterl.lazycode.lazysodium.exceptions.SodiumException;
-import com.goterl.lazycode.lazysodium.interfaces.Helpers;
-import com.goterl.lazycode.lazysodium.interfaces.SecretBox;
-import com.goterl.lazycode.lazysodium.utils.Key;
-
 import static com.pusher.client.util.internal.Preconditions.checkArgument;
 import static com.pusher.client.util.internal.Preconditions.checkNotNull;
 import static java.util.Arrays.fill;
@@ -52,14 +45,11 @@ public String open(byte[] cypher, byte[] nonce) throws AuthenticityException {
         checkNotNull(key, "key has been cleared, create new instance");
         checkArgument(nonce.length == 24, "nonce length must be 24 bytes, but is " +
                 key.length + " bytes");
-
-
-        SecretBox.Lazy secretBoxLazy = (SecretBox.Lazy) Sodium.getInstance();
-
         try {
-            return secretBoxLazy.cryptoSecretBoxOpenEasy(
-                    Sodium.getInstance().sodiumBin2Hex(cypher), nonce, Key.fromBytes(key));
-        } catch (SodiumException e) {
+            TweetNaclFast.SecretBox secretBox = new TweetNaclFast.SecretBox(key);
+            byte[] result = secretBox.open(cypher, nonce);
+            return new String(result);
+        } catch (Exception e) {
             throw new AuthenticityException();
         }
     }