Merge pull request #163

11348c4 refactor names (djb) d736378 refactor names (djb)
BitBoxSwiss · Jul 30, 2016 · f5c25ba · f5c25ba
2 parents 2aedb9f + 11348c4
commit f5c25ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/memory.c b/src/memory.c
@@ -230,7 +230,7 @@ int memory_setup(void)
     } else {
         memory_mempass();
         memory_eeprom_crypt(NULL, MEM_aeskey_stand, MEM_AESKEY_STAND_ADDR);
-        memory_eeprom_crypt(NULL, MEM_aeskey_reset, MEM_AESKEY_RESET_ADDR);
+        memory_eeprom_crypt(NULL, MEM_aeskey_reset, MEM_AESKEY_HIDDEN_ADDR);
         memory_eeprom_crypt(NULL, MEM_aeskey_crypt, MEM_AESKEY_CRYPT_ADDR);
         memory_eeprom_crypt(NULL, MEM_aeskey_verify, MEM_AESKEY_VERIFY_ADDR);
         memory_eeprom(NULL, &MEM_erased, MEM_ERASED_ADDR, 1);
@@ -354,7 +354,7 @@ int memory_write_aeskey(const char *password, int len, PASSWORD_ID id)
             ret = memory_eeprom_crypt(password_b, MEM_aeskey_stand, MEM_AESKEY_STAND_ADDR);
             break;
         case PASSWORD_HIDDEN:
-            ret = memory_eeprom_crypt(password_b, MEM_aeskey_reset, MEM_AESKEY_RESET_ADDR);
+            ret = memory_eeprom_crypt(password_b, MEM_aeskey_reset, MEM_AESKEY_HIDDEN_ADDR);
             break;
         case PASSWORD_CRYPT:
             ret = memory_eeprom_crypt(password_b, MEM_aeskey_crypt, MEM_AESKEY_CRYPT_ADDR);

diff --git a/src/memory.h b/src/memory.h
@@ -34,19 +34,21 @@
 #define MEM_PAGE_LEN      32
 
 // User Zones: 0x0000 to 0x0FFF
+// Do NOT change address locations.
+// Otherwise problems will occur after a firmware update.
 #define MEM_ERASED_ADDR                 0x0000// Zone 0
 #define MEM_SETUP_ADDR                  0x0002
 #define MEM_ACCESS_ERR_ADDR             0x0004
 #define MEM_PIN_ERR_ADDR                0x0006
 #define MEM_UNLOCKED_ADDR               0x0008
 #define MEM_NAME_ADDR                   0x0100// Zone 1
-#define MEM_MASTER_BIP32_ADDR           0x0200// Zone 2
-#define MEM_MASTER_BIP32_CHAIN_ADDR     0x0300// Zone 3
-#define MEM_AESKEY_STAND_ADDR           0x0400// Zone 4
-#define MEM_AESKEY_VERIFY_ADDR          0x0500// Zone 5
-#define MEM_AESKEY_CRYPT_ADDR           0x0600// Zone 6
-#define MEM_AESKEY_RESET_ADDR           0x0700// Zone 7
-#define MEM_MASTER_ENTROPY_ADDR         0x0800// Zone 8
+#define MEM_MASTER_BIP32_ADDR           0x0200
+#define MEM_MASTER_BIP32_CHAIN_ADDR     0x0300
+#define MEM_AESKEY_STAND_ADDR           0x0400
+#define MEM_AESKEY_VERIFY_ADDR          0x0500
+#define MEM_AESKEY_CRYPT_ADDR           0x0600
+#define MEM_AESKEY_HIDDEN_ADDR          0x0800// Zone 7 reserved
+#define MEM_MASTER_ENTROPY_ADDR         0x0900
 
 
 // Default settings

diff --git a/src/sd.h b/src/sd.h
@@ -40,7 +40,7 @@
 #define SD_PDF_4_0_HEAD   "4 0 obj\n<< /Length %i >>\nstream\n"
 #define SD_PDF_BACKUP_START "<20 2020202020> Tj"
 #define SD_PDF_BACKUP_END   "<2020202020 20> Tj"
-#define SD_PDF_TEXT_0     "BT\n/F1 12 Tf\n50 700 Td\n(Wallet seed:) Tj\n" SD_PDF_BACKUP_START "\n0 -24 Td\n("
+#define SD_PDF_TEXT_0     "BT\n/F1 12 Tf\n50 700 Td\n(Wallet backup:) Tj\n" SD_PDF_BACKUP_START "\n0 -24 Td\n("
 #define SD_PDF_TEXT_CONT  ") Tj\n0 -16 Td\n("
 #define SD_PDF_TEXT_1     ") Tj\n0 -16 Td\n%%(" BACKUP_DELIM_S
 #define SD_PDF_TEXT_2     ") Tj\n" SD_PDF_BACKUP_END "\n0 -48 Td\n(Wallet name: "