sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-11-05 11:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Satochip: Add pin size check during initialization

Browse source
This commit is contained in:
Toporin 2023-09-06 21:07:57 +01:00
parent 6f028d720b
commit 5b203a6c61
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java
View file

@ -1075,11 +1075,17 @@ public class DevicePane extends TitledDescriptionPane {
initializeButton.setOnAction(event -> {
initializeButton.setDisable(true);
byte[] seedBytes;
// check that pin and previous pin match
if ( !pin.get().equals(repeatedPin.getText()) ){
seedBytes = null; // will display a proper error later in cardApi.getInitializationService()
messageProperty.set("The two entered Pin values do not correspond!");
} else {
try{
// check that pin and previous pin match
if ( !pin.get().equals(repeatedPin.getText()) ){
throw new RuntimeException("The two entered PIN values do not correspond!");
}
// check pin size
int pinSize = pin.get().getBytes(StandardCharsets.UTF_8).length;
if (pinSize < 4 || pinSize >16 ){
throw new RuntimeException("PIN size should be between 4 and 16 characters included!");
}
// check the seed
try{
// check bip39 is correct & convert seed to masterseed bytes
List<String> mnemonicWords = Arrays.asList(mnemonic.getText().split("[\\s,]+")); // \\s*,\\s*
@ -1087,9 +1093,12 @@ public class DevicePane extends TitledDescriptionPane {
DeterministicSeed seed = new DeterministicSeed(mnemonicWords, passphrase.getText(), System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
seedBytes = seed.getSeedBytes();
} catch (Exception e) {
seedBytes = null; // will display a proper error later in cardApi.getInitializationService()
messageProperty.set("Failed to parse the seed with error: " + e);
throw new RuntimeException("Failed to parse the seed with error: " + e);
}
} catch (Exception e) {
seedBytes = null; // will display a proper error later in cardApi.getInitializationService()
messageProperty.set(e.getMessage());
}
Service<Void> cardInitializationService = cardApi.getInitializationService(seedBytes, messageProperty);
cardInitializationService.setOnSucceeded(successEvent -> {