summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2016-11-09 19:20:51 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2016-12-03 16:01:49 +0100
commitb94d61b2f3c446c46ac2f660d954841d740782f5 (patch)
treec3713f74a99c9bad70124a1bbf7b1bf4660d2a4c
parent90bf7f564c50bf48799056179dbc5a09b7782d27 (diff)
downloadlibnitrokey-b94d61b2f3c446c46ac2f660d954841d740782f5.tar.gz
libnitrokey-b94d61b2f3c446c46ac2f660d954841d740782f5.tar.bz2
Detect Pro 0.8
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--unittest/misc.py4
-rw-r--r--unittest/test_pro.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/unittest/misc.py b/unittest/misc.py
index b45436d..8296814 100644
--- a/unittest/misc.py
+++ b/unittest/misc.py
@@ -31,6 +31,10 @@ def is_pro_rtm_07(C):
firmware = get_firmware_version_from_status(C)
return '07 00' in firmware
+def is_pro_rtm_08(C):
+ firmware = get_firmware_version_from_status(C)
+ return '08 00' in firmware
+
def is_storage(C):
"""
diff --git a/unittest/test_pro.py b/unittest/test_pro.py
index 6ab2af9..c7772d6 100644
--- a/unittest/test_pro.py
+++ b/unittest/test_pro.py
@@ -2,7 +2,7 @@ import pytest
from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET
from misc import ffi, gs, wait, cast_pointer_to_tuple
-from misc import is_pro_rtm_07, is_storage
+from misc import is_pro_rtm_07, is_pro_rtm_08, is_storage
def test_enable_password_safe(C):
assert C.NK_lock_device() == DeviceErrorCode.STATUS_OK
@@ -61,7 +61,7 @@ def test_password_safe_slot_status(C):
def test_issue_device_locks_on_second_key_generation_in_sequence(C):
- if is_pro_rtm_07(C):
+ if is_pro_rtm_07(C) or is_pro_rtm_08(C):
pytest.skip("issue to register: device locks up "
"after below commands sequence (reinsertion fixes), skipping for now")
assert C.NK_build_aes_key(DefaultPasswords.ADMIN) == DeviceErrorCode.STATUS_OK