bitmessage/Jabit
bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release/2.0.1'

Browse Source
This commit is contained in:
Christian Basler 2016-10-07 22:10:00 +02:00
commit 15c6540e16
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
View File

@ -63,15 +63,15 @@ public class WifImporter {
Profile.Section section = entry.getValue(); Profile.Section section = entry.getValue();
BitmessageAddress address = Factory.createIdentityFromPrivateKey( BitmessageAddress address = Factory.createIdentityFromPrivateKey(
entry.getKey(), entry.getKey(),
getSecret(section.get("privsigningkey")), getSecret(section.get("privsigningkey")),
getSecret(section.get("privencryptionkey")), getSecret(section.get("privencryptionkey")),
section.get("noncetrialsperbyte", long.class), Long.parseLong(section.get("noncetrialsperbyte")),
section.get("payloadlengthextrabytes", long.class), Long.parseLong(section.get("payloadlengthextrabytes")),
Pubkey.Feature.bitfield(features) Pubkey.Feature.bitfield(features)
); );
if (section.containsKey("chan")) { if (section.containsKey("chan")) {
address.setChan(section.get("chan", boolean.class)); address.setChan(Boolean.parseBoolean(section.get("chan")));
} }
address.setAlias(section.get("label")); address.setAlias(section.get("label"));
identities.add(address); identities.add(address);
@ -82,10 +82,10 @@ public class WifImporter {
byte[] bytes = Base58.decode(walletImportFormat); byte[] bytes = Base58.decode(walletImportFormat);
if (bytes[0] != WIF_FIRST_BYTE) if (bytes[0] != WIF_FIRST_BYTE)
throw new IOException("Unknown format: 0x80 expected as first byte, but secret " + walletImportFormat + throw new IOException("Unknown format: 0x80 expected as first byte, but secret " + walletImportFormat +
" was " + bytes[0]); " was " + bytes[0]);
if (bytes.length != WIF_SECRET_LENGTH) if (bytes.length != WIF_SECRET_LENGTH)
throw new IOException("Unknown format: " + WIF_SECRET_LENGTH + throw new IOException("Unknown format: " + WIF_SECRET_LENGTH +
" bytes expected, but secret " + walletImportFormat + " was " + bytes.length + " long"); " bytes expected, but secret " + walletImportFormat + " was " + bytes.length + " long");
byte[] hash = cryptography().doubleSha256(bytes, 33); byte[] hash = cryptography().doubleSha256(bytes, 33);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {