Merge pull request #53 from Nitrokey/nk_pro_0.8_authorization_fix-longer_secretv2.0

Support for Nitrokey Pro 0.8

1 files changed, 18 insertions, 4 deletions

diff --git a/unittest/test_storage.py b/unittest/test_storage.py
index 01276ce..a1c59aa 100644
--- a/unittest/test_storage.py
+++ b/unittest/test_storage.py
@@ -1,9 +1,10 @@
-import pytest
+import pprint
 
-from misc import ffi, gs, wait, cast_pointer_to_tuple
-from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, LibraryErrors
+import pytest
 
-import pprint
+from conftest import skip_if_device_version_lower_than
+from constants import DefaultPasswords, DeviceErrorCode
+from misc import gs, wait
 pprint = pprint.PrettyPrinter(indent=4).pprint
 
 
@@ -22,6 +23,7 @@ def get_dict_from_dissect(status):
 
 
 def test_get_status_storage(C):
+    skip_if_device_version_lower_than({'S': 43})
     status_pointer = C.NK_get_status_storage_as_string()
     assert C.NK_get_last_command_status() == DeviceErrorCode.STATUS_OK
     status_string = gs(status_pointer)
@@ -32,6 +34,7 @@ def test_get_status_storage(C):
 
 
 def test_sd_card_usage(C):
+    skip_if_device_version_lower_than({'S': 43})
     data_pointer = C.NK_get_SD_usage_data_as_string()
     assert C.NK_get_last_command_status() == DeviceErrorCode.STATUS_OK
     data_string = gs(data_pointer)
@@ -41,11 +44,13 @@ def test_sd_card_usage(C):
 
 
 def test_encrypted_volume_unlock(C):
+    skip_if_device_version_lower_than({'S': 43})
     assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
     assert C.NK_unlock_encrypted_volume(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK
 
 
 def test_encrypted_volume_unlock_hidden(C):
+    skip_if_device_version_lower_than({'S': 43})
     hidden_volume_password = 'hiddenpassword'
     assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
     assert C.NK_unlock_encrypted_volume(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK
@@ -54,6 +59,7 @@ def test_encrypted_volume_unlock_hidden(C):
 
 @pytest.mark.skip(reason='hangs device, to report')
 def test_encrypted_volume_setup_multiple_hidden(C):
+    skip_if_device_version_lower_than({'S': 43})
     hidden_volume_password = 'hiddenpassword'
     p = lambda i: hidden_volume_password + str(i)
     assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
@@ -67,25 +73,30 @@ def test_encrypted_volume_setup_multiple_hidden(C):
 
 
 def test_unencrypted_volume_set_read_only(C):
+    skip_if_device_version_lower_than({'S': 43})
     assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
     assert C.NK_set_unencrypted_read_only(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK
 
 
 def test_unencrypted_volume_set_read_write(C):
+    skip_if_device_version_lower_than({'S': 43})
     assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
     assert C.NK_set_unencrypted_read_write(DefaultPasswords.USER) == DeviceErrorCode.STATUS_OK
 
 
 def test_export_firmware(C):
+    skip_if_device_version_lower_than({'S': 43})
     assert C.NK_export_firmware(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
 
 
 def test_clear_new_sd_card_notification(C):
+    skip_if_device_version_lower_than({'S': 43})
     assert C.NK_clear_new_sd_card_warning(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK
 
 
 @pytest.mark.skip
 def test_fill_SD_card(C):
+    skip_if_device_version_lower_than({'S': 43})
     status = C.NK_fill_SD_card_with_random_data(DefaultPasswords.ADMIN)
     assert status == DeviceErrorCode.STATUS_OK or status == DeviceErrorCode.BUSY
     while 1:
@@ -97,12 +108,14 @@ def test_fill_SD_card(C):
 
 
 def test_get_busy_progress_on_idle(C):
+    skip_if_device_version_lower_than({'S': 43})
     value = C.NK_get_progress_bar_value()
     assert value == -1
     assert C.NK_get_last_command_status() == DeviceErrorCode.STATUS_OK
 
 
 def test_change_update_password(C):
+    skip_if_device_version_lower_than({'S': 43})
     wrong_password = 'aaaaaaaaaaa'
     assert C.NK_change_update_password(wrong_password, DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.WRONG_PASSWORD
     assert C.NK_change_update_password(DefaultPasswords.UPDATE, DefaultPasswords.UPDATE_TEMP) == DeviceErrorCode.STATUS_OK
@@ -110,5 +123,6 @@ def test_change_update_password(C):
 
 
 def test_send_startup(C):
+    skip_if_device_version_lower_than({'S': 43})
     time_seconds_from_epoch = 0 # FIXME set proper date
     assert C.NK_send_startup(time_seconds_from_epoch) == DeviceErrorCode.STATUS_OK