Replace libsodium with cryptology

autobahn/src/main/java/io/crossbar/autobahn/wamp/auth/CryptosignAuth.java

@@ -1,10 +1,14 @@
 package io.crossbar.autobahn.wamp.auth;
 
-import org.libsodium.jni.crypto.Random;
-import org.libsodium.jni.keys.SigningKey;
-import org.libsodium.jni.keys.VerifyKey;
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator;
+import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters;
+import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
+import org.bouncycastle.crypto.signers.Ed25519Signer;
 
 import java.io.File;
+import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -16,7 +20,6 @@
 import io.crossbar.autobahn.wamp.types.Challenge;
 import io.crossbar.autobahn.wamp.types.ChallengeResponse;
 
-import static org.libsodium.jni.SodiumConstants.SECRETKEY_BYTES;
 
 public class CryptosignAuth implements IAuthenticator {
     public static final String authmethod = "cryptosign";
@@ -28,22 +31,29 @@ public class CryptosignAuth implements IAuthenticator {
     private final byte[] privateKeyRaw;
 
     public static Pair<String, String> generateSigningKeyPair() {
-        VerifyKey key = new VerifyKey(new Random().randomBytes(SECRETKEY_BYTES));
-        SigningKey signingKey = new SigningKey(key.toBytes());
+        Ed25519KeyPairGenerator keyPairGenerator = new Ed25519KeyPairGenerator();
+        keyPairGenerator.init(new Ed25519KeyGenerationParameters(new SecureRandom()));
 
-        String privateKey = AuthUtil.toHexString(key.toBytes());
-        String publicKey = AuthUtil.toHexString(signingKey.getVerifyKey().toBytes());
+        AsymmetricCipherKeyPair keyPair = keyPairGenerator.generateKeyPair();
 
-        return new Pair<>(publicKey, privateKey);
+        Ed25519PrivateKeyParameters privateKey = (Ed25519PrivateKeyParameters) keyPair.getPrivate();
+        Ed25519PublicKeyParameters publicKey = (Ed25519PublicKeyParameters) keyPair.getPublic();
+
+        String privateKeyHex = AuthUtil.toHexString(privateKey.getEncoded());
+        String publicKeyHex = AuthUtil.toHexString(publicKey.getEncoded());
+
+        return new Pair<>(publicKeyHex, privateKeyHex);
     }
 
     public CryptosignAuth(String authid, String privateKey) {
         this(authid, privateKey, getPublicKey(AuthUtil.toBinary(privateKey)));
     }
 
     public static String getPublicKey(byte[] privateKeyRaw) {
-        SigningKey signingKey = new SigningKey(privateKeyRaw);
-        return AuthUtil.toHexString(signingKey.getVerifyKey().toBytes());
+        Ed25519PrivateKeyParameters privateKey = new Ed25519PrivateKeyParameters(privateKeyRaw, 0);
+
+        byte[] publicKeyBytes = privateKey.generatePublicKey().getEncoded();
+        return AuthUtil.toHexString(publicKeyBytes);
     }
 
     public CryptosignAuth(String authid, String privkey, Map<String, Object> authextra) {
@@ -85,8 +95,11 @@ public CompletableFuture<ChallengeResponse> onChallenge(Session session, Challen
         String hexChallenge = (String) challenge.extra.get("challenge");
         byte[] rawChallenge = AuthUtil.toBinary(hexChallenge);
 
-        SigningKey key = new SigningKey(privateKeyRaw);
-        byte[] signed = key.sign(rawChallenge);
+        Ed25519PrivateKeyParameters privateKey = new Ed25519PrivateKeyParameters(privateKeyRaw, 0);
+        Ed25519Signer signer = new Ed25519Signer();
+        signer.init(true, privateKey);
+        signer.update(rawChallenge, 0, rawChallenge.length);
+        byte[] signed =signer.generateSignature();
 
         String signatureHex = AuthUtil.toHexString(signed);
         String res = signatureHex + hexChallenge;