Blockchain format: Fix data over-read bug

openwall · Jan 5, 2024 · 0cc2587 · 0cc2587
1 parent 478b447
commit 0cc2587
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/blockchain_common_plug.c b/src/blockchain_common_plug.c
@@ -118,9 +118,9 @@ int blockchain_decrypt(unsigned char *derived_key, unsigned char *data)
 
  // "guid" will be found in the first block
  if (memmem(out, 16, "\"guid\"", 6)) {
- AES_cbc_encrypt(data + 32, out + 16, SAFETY_FACTOR - 16, &akey, iv,
+ AES_cbc_encrypt(data + 32, out + 16, SAFETY_FACTOR - 32, &akey, iv,
  AES_DECRYPT);
- if (memmem(out, SAFETY_FACTOR, "\"sharedKey\"", 11))
+ if (memmem(out, SAFETY_FACTOR - 16, "\"sharedKey\"", 11))
  // Do not check for "options" string. It is too further
  // down in the byte stream for v3 wallets. Note, we
  // 'could' check that the guid and sharedKey values are