Merge branch 'master' into wip/crypto-ctr

diff --cc source/firm/firm.c
index 34c0e12fd6caa08aac78b3a14daff34c22b3b479,07a03b8fc13f194a50cd87a6b535892210bf1af3..9b231143631d58b6c81c92ee0af7b15d627e62aa
--- 1/source/firm/firm.c
--- 2/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");