Support for setting hidden volume and test for it

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>

2 files changed, 37 insertions, 2 deletions

diff --git a/include/stick20_commands.h b/include/stick20_commands.h
index 4bbb8c0..a1e65c2 100644
--- a/include/stick20_commands.h
+++ b/include/stick20_commands.h
@@ -282,8 +282,23 @@ namespace nitrokey {
                     uint8_t SlotNr_u8;
                     uint8_t StartBlockPercent_u8;
                     uint8_t EndBlockPercent_u8;
-                    uint8_t HiddenVolumePassword_au8[MAX_HIDDEN_VOLUME_PASSOWORD_SIZE + 1];
-                }__packed;
+                    uint8_t HiddenVolumePassword_au8[MAX_HIDDEN_VOLUME_PASSOWORD_SIZE + 1]; //last char is a null terminator TODO check if it's needed
+                    std::string dissect() const {
+                      std::stringstream ss;
+                      print_to_ss((int) SlotNr_u8);
+                      print_to_ss((int) StartBlockPercent_u8);
+                      print_to_ss((int) EndBlockPercent_u8);
+                      ss << " HiddenVolumePassword_au8:\t"
+                         << HiddenVolumePassword_au8 << std::endl;
+                      return ss.str();
+                    }
+
+                    void set_defaults(){
+                      SlotNr_u8 = 0;
+                      StartBlockPercent_u8 = 70;
+                      EndBlockPercent_u8 = 90;
+                    }
+                } __packed;
 
                 typedef Transaction<command_id(), struct CommandPayload, struct EmptyPayload>
                     CommandTransaction;
diff --git a/unittest/test2.cc b/unittest/test2.cc
index 8e3dacc..d79042a 100644
--- a/unittest/test2.cc
+++ b/unittest/test2.cc
@@ -126,6 +126,26 @@ TEST_CASE("test device internal status with various commands", "[fast]") {
   REQUIRE(production_status.data().SD_CardID_u32 != 0);
 }
 
+TEST_CASE("setup hidden volume test", "[hidden]") {
+  Stick20 stick;
+  bool connected = stick.connect();
+  REQUIRE(connected == true);
+  Log::instance().set_loglevel(Loglevel::DEBUG_L2);
+  stick10::LockDevice::CommandTransaction::run(stick);
+  this_thread::sleep_for(2000ms);
+
+  execute_password_command<EnableEncryptedPartition>(stick, "123456");
+
+  auto p = get_payload<stick20::SetupHiddenVolume>();
+  p.set_defaults();
+  auto hidden_volume_password = "123123123";
+  strcpyT(p.HiddenVolumePassword_au8, hidden_volume_password);
+  stick20::SetupHiddenVolume::CommandTransaction::run(stick, p);
+  this_thread::sleep_for(2000ms);
+
+  execute_password_command<EnableHiddenEncryptedPartition>(stick, hidden_volume_password);
+}
+
 TEST_CASE("general test", "[test]") {
   Stick20 stick;
   bool connected = stick.connect();