From: chaoskagami <chaos.kagami@gmail.com>
Date: Sat, 30 Jul 2016 05:14:56 +0000 (-0400)
Subject: Merge branch 'master' into wip/crypto-ctr
X-Git-Tag: v0.3.0~66^2~1^2~5
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=6de985189eb0020dcd20dba547670a10691e9ec7;p=corbenik%2Fcorbenik.git

Merge branch 'master' into wip/crypto-ctr
---

6de985189eb0020dcd20dba547670a10691e9ec7
diff --cc source/firm/firm.c
index 34c0e12,07a03b8..9b23114
--- a/source/firm/firm.c
+++ b/source/firm/firm.c
@@@ -60,7 -61,9 +61,7 @@@ void dump_firm(firm_h** buffer, uint8_
  
      use_aeskey(0x06);
      set_ctr(ctr);
- 	ctr_decrypt(firm, firm, firm_size / AES_BLOCK_SIZE, AES_CTR_MODE|AES_CNT_INPUT_ENDIAN|AES_CNT_OUTPUT_ENDIAN|AES_CNT_INPUT_ORDER|AES_CNT_OUTPUT_ORDER, ctr);
 -    aes(firm, firm, firm_b_size / AES_BLOCK_SIZE, ctr, AES_CTR_MODE);
 -
 -    fprintf(stderr, "  AES decrypted FIRM%u.\n", index);
++	ctr_decrypt(firm, firm, firm_b_size / AES_BLOCK_SIZE, AES_CTR_MODE|AES_CNT_INPUT_ENDIAN|AES_CNT_OUTPUT_ENDIAN|AES_CNT_INPUT_ORDER|AES_CNT_OUTPUT_ORDER, ctr);
  
      if (memcmp((char*) & firm->magic, "FIRM", 4))
          abort("  Decryption failed on FIRM.\n");