arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 09:28:13 +00:00
Code Issues Releases Wiki Activity

bump version to 1.3.1

Browse Source
This commit is contained in:
Pavol Rusnak 2015-02-16 13:48:24 +01:00
parent 94531f264e
commit f2f50aa188
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware-docker-build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
IMAGETAG=trezor-mcu-build IMAGETAG=trezor-mcu-build
FIRMWARETAG=v1.3.0 FIRMWARETAG=v1.3.1
docker build -t $IMAGETAG . docker build -t $IMAGETAG .
docker run -t -v $(pwd):/output $IMAGETAG /bin/sh -c "\ docker run -t -v $(pwd):/output $IMAGETAG /bin/sh -c "\

5
firmware/storage.c
View File

@ -63,7 +63,7 @@ static char sessionPassphrase[51];
0x0010 | ? | Storage structure 0x0010 | ? | Storage structure
*/ */
#define STORAGE_VERSION 2 #define STORAGE_VERSION 3
void storage_from_flash(uint32_t version) void storage_from_flash(uint32_t version)
{ {
@ -74,6 +74,9 @@ void storage_from_flash(uint32_t version)
case 2: // copy case 2: // copy
memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage)); memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage));
break; break;
case 3: // copy
memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage));
break;
} }
storage.version = STORAGE_VERSION; storage.version = STORAGE_VERSION;
} }

2
firmware/trezor.h
View File

@ -22,7 +22,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_PATCH 0 #define VERSION_PATCH 1
#define STR(X) #X #define STR(X) #X
#define VERSTR(X) STR(X) #define VERSTR(X) STR(X)