Check private view key is a valid scalar.

bisq-network · Mar 26, 2023 · 165f2d0 · 165f2d0
1 parent e2b25c1
commit 165f2d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/bisq/core/xmr/knaccc/monero/address/WalletAddress.java b/core/src/main/java/bisq/core/xmr/knaccc/monero/address/WalletAddress.java
@@ -131,7 +131,13 @@ public String getSubaddressBase58(String privateViewKeyHex, long accountId, long
     }
 
     public boolean checkPrivateViewKey(String privateViewKey) {
-        return arePubPrivKeysRelated(this.publicViewKeyHex, privateViewKey);
+        return isPrivateKeyValid(privateViewKey) && arePubPrivKeysRelated(this.publicViewKeyHex, privateViewKey);
+    }
+
+    public static boolean isPrivateKeyValid(String privateKey) {
+        byte[] input = hexToBytes(privateKey);
+        byte[] reduced = CryptoUtil.scReduce32(input);
+        return Arrays.equals(input, reduced);
     }
 
     public static boolean arePubPrivKeysRelated(String publicKey, String privateKey) {

diff --git a/core/src/test/java/knaccc/monero/address/WalletAddressTest.java b/core/src/test/java/knaccc/monero/address/WalletAddressTest.java
@@ -66,5 +66,9 @@ public void testWalletAddress() throws WalletAddress.InvalidWalletAddressExcepti
                 "0000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF",
                 "0000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF"),
                 false);
+
+        String nonReducedPrivateKey = "42594aba0e809490dec97b2dfaf64f7ae5bef1c2d19af636eb84544773df5b5f";
+        assertEquals(WalletAddress.isPrivateKeyValid(nonReducedPrivateKey), false);
+        assertEquals(WalletAddress.isPrivateKeyValid(privateViewKeyHex), true);
     }
 }