From f2f50aa1886429aaeab5aa88e8c6e106ac5224b1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 16 Feb 2015 13:48:24 +0100 Subject: [PATCH] bump version to 1.3.1 --- firmware-docker-build.sh | 2 +- firmware/storage.c | 5 ++++- firmware/trezor.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/firmware-docker-build.sh b/firmware-docker-build.sh index 375bc7c90d..cb4f524f71 100755 --- a/firmware-docker-build.sh +++ b/firmware-docker-build.sh @@ -1,6 +1,6 @@ #!/bin/bash IMAGETAG=trezor-mcu-build -FIRMWARETAG=v1.3.0 +FIRMWARETAG=v1.3.1 docker build -t $IMAGETAG . docker run -t -v $(pwd):/output $IMAGETAG /bin/sh -c "\ diff --git a/firmware/storage.c b/firmware/storage.c index bc9aaea8fe..d540e7f184 100644 --- a/firmware/storage.c +++ b/firmware/storage.c @@ -63,7 +63,7 @@ static char sessionPassphrase[51]; 0x0010 | ? | Storage structure */ -#define STORAGE_VERSION 2 +#define STORAGE_VERSION 3 void storage_from_flash(uint32_t version) { @@ -74,6 +74,9 @@ void storage_from_flash(uint32_t version) case 2: // copy memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage)); break; + case 3: // copy + memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage)); + break; } storage.version = STORAGE_VERSION; } diff --git a/firmware/trezor.h b/firmware/trezor.h index 9ef2e81dd7..0a368c6627 100644 --- a/firmware/trezor.h +++ b/firmware/trezor.h @@ -22,7 +22,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 -#define VERSION_PATCH 0 +#define VERSION_PATCH 1 #define STR(X) #X #define VERSTR(X) STR(X)