Keypair: Convert to java-style array declarations

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-09 02:44:46 -05:00
parent f6b864d4e7
commit c3afe5be2c

View File

@ -11,7 +11,7 @@ import java.security.SecureRandom;
public class Keypair { public class Keypair {
private static byte[] generatePrivateKey() { private static byte[] generatePrivateKey() {
final SecureRandom secureRandom = new SecureRandom(); final SecureRandom secureRandom = new SecureRandom();
final byte privateKey[] = new byte[KeyEncoding.WG_KEY_LEN]; final byte[] privateKey = new byte[KeyEncoding.WG_KEY_LEN];
secureRandom.nextBytes(privateKey); secureRandom.nextBytes(privateKey);
privateKey[0] &= 248; privateKey[0] &= 248;
privateKey[31] &= 127; privateKey[31] &= 127;
@ -19,20 +19,20 @@ public class Keypair {
return privateKey; return privateKey;
} }
private static byte[] generatePublicKey(byte privateKey[]) { private static byte[] generatePublicKey(byte[] privateKey) {
final byte publicKey[] = new byte[KeyEncoding.WG_KEY_LEN]; final byte[] publicKey = new byte[KeyEncoding.WG_KEY_LEN];
Curve25519.eval(publicKey, 0, privateKey, null); Curve25519.eval(publicKey, 0, privateKey, null);
return publicKey; return publicKey;
} }
private final byte privateKey[]; private final byte[] privateKey;
private final byte publicKey[]; private final byte[] publicKey;
public Keypair() { public Keypair() {
this(generatePrivateKey()); this(generatePrivateKey());
} }
private Keypair(byte privateKey[]) { private Keypair(byte[] privateKey) {
this.privateKey = privateKey; this.privateKey = privateKey;
publicKey = generatePublicKey(privateKey); publicKey = generatePublicKey(privateKey);
} }