Merge pull request #1805 from mcovalt/electrum_salt_type_2
Electrum Salt-Type 2
This commit is contained in:
@@ -17870,7 +17870,7 @@ int electrum_wallet13_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf
|
||||
|
||||
const u32 salt_type = hc_strtoul ((const char *) salt_type_pos, NULL, 10);
|
||||
|
||||
if ((salt_type == 1) || (salt_type == 2) || (salt_type == 3))
|
||||
if ((salt_type == 1) || (salt_type == 2))
|
||||
{
|
||||
// all ok
|
||||
}
|
||||
|
||||
@@ -401,7 +401,7 @@ static const char *const USAGE_BIG[] =
|
||||
" 11300 | Bitcoin/Litecoin wallet.dat | Password Managers",
|
||||
" 12700 | Blockchain, My Wallet | Password Managers",
|
||||
" 15200 | Blockchain, My Wallet, V2 | Password Managers",
|
||||
" 16600 | Electrum Wallet (Salt-Type 1-3) | Password Managers",
|
||||
" 16600 | Electrum Wallet (Salt-Type 1-2) | Password Managers",
|
||||
" 13400 | KeePass 1 (AES/Twofish) and KeePass 2 (AES) | Password Managers",
|
||||
" 15500 | JKS Java Key Store Private Keys (SHA1) | Password Managers",
|
||||
" 15600 | Ethereum Wallet, PBKDF2-HMAC-SHA256 | Password Managers",
|
||||
|
||||
Reference in New Issue
Block a user