project: Global cleanup

Signed-off-by: Samuel Holland <samuel@sholland.org>

app/src/main/java/com/wireguard/crypto/Keypair.java

@@ -7,22 +7,6 @@ import java.security.SecureRandom;
  */
 
 public class Keypair {
-    private static byte[] generatePrivateKey() {
-        final SecureRandom secureRandom = new SecureRandom();
-        final byte[] privateKey = new byte[KeyEncoding.KEY_LENGTH];
-        secureRandom.nextBytes(privateKey);
-        privateKey[0] &= 248;
-        privateKey[31] &= 127;
-        privateKey[31] |= 64;
-        return privateKey;
-    }
-
-    private static byte[] generatePublicKey(final byte[] privateKey) {
-        final byte[] publicKey = new byte[KeyEncoding.KEY_LENGTH];
-        Curve25519.eval(publicKey, 0, privateKey, null);
-        return publicKey;
-    }
-
     private final byte[] privateKey;
     private final byte[] publicKey;
 
@@ -39,6 +23,22 @@ public class Keypair {
         this(KeyEncoding.keyFromBase64(privateKey));
     }
 
+    private static byte[] generatePrivateKey() {
+        final SecureRandom secureRandom = new SecureRandom();
+        final byte[] privateKey = new byte[KeyEncoding.KEY_LENGTH];
+        secureRandom.nextBytes(privateKey);
+        privateKey[0] &= 248;
+        privateKey[31] &= 127;
+        privateKey[31] |= 64;
+        return privateKey;
+    }
+
+    private static byte[] generatePublicKey(final byte[] privateKey) {
+        final byte[] publicKey = new byte[KeyEncoding.KEY_LENGTH];
+        Curve25519.eval(publicKey, 0, privateKey, null);
+        return publicKey;
+    }
+
     public String getPrivateKey() {
         return KeyEncoding.keyToBase64(privateKey);
     }