aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2019-03-18 20:15:58 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2019-03-18 20:16:02 +0100
commit3a797e0db06b66a9f333cc5126a39eec3a1e3695 (patch)
tree3995bf825e43a50257eb3a2a94ff602aaa0c78ed
parente27e252aff13496b9e7cd1c064aced9b9a3d7500 (diff)
downloadlibnitrokey-3a797e0db06b66a9f333cc5126a39eec3a1e3695.tar.gz
libnitrokey-3a797e0db06b66a9f333cc5126a39eec3a1e3695.tar.bz2
Unlock 64 bit tests for Storage
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--unittest/misc.py6
-rw-r--r--unittest/test_pro.py6
2 files changed, 8 insertions, 4 deletions
diff --git a/unittest/misc.py b/unittest/misc.py
index 8be915d..c1c197b 100644
--- a/unittest/misc.py
+++ b/unittest/misc.py
@@ -67,4 +67,8 @@ def is_storage(C):
def is_long_OTP_secret_handled(C):
- return is_pro_rtm_08(C) or is_storage(C) and get_devices_firmware_version(C) > 43
+ return is_pro_rtm_08(C) or is_storage(C) and get_devices_firmware_version(C) >= 54
+
+
+def has_binary_counter(C):
+ return is_pro_rtm_07(C) or is_storage(C) and get_devices_firmware_version(C) >= 54
diff --git a/unittest/test_pro.py b/unittest/test_pro.py
index 7d3dc69..d094dec 100644
--- a/unittest/test_pro.py
+++ b/unittest/test_pro.py
@@ -23,7 +23,7 @@ import pytest
from conftest import skip_if_device_version_lower_than
from constants import DefaultPasswords, DeviceErrorCode, RFC_SECRET, bb, bbRFC_SECRET
-from misc import ffi, gs, wait, cast_pointer_to_tuple
+from misc import ffi, gs, wait, cast_pointer_to_tuple, has_binary_counter
from misc import is_pro_rtm_07, is_pro_rtm_08, is_storage
@pytest.mark.lock_device
@@ -409,7 +409,7 @@ def test_HOTP_counters(C):
INT32_MAX = 2 ** 31 - 1
@pytest.mark.otp
def test_HOTP_64bit_counter(C):
- if is_storage(C):
+ if not has_binary_counter(C):
pytest.xfail('bug in NK Storage HOTP firmware - counter is set with a 8 digits string, '
'however int32max takes 10 digits to be written')
oath = pytest.importorskip("oath")
@@ -434,7 +434,7 @@ def test_HOTP_64bit_counter(C):
@pytest.mark.otp
def test_TOTP_64bit_time(C):
- if is_storage(C):
+ if not has_binary_counter(C):
pytest.xfail('bug in NK Storage TOTP firmware')
oath = pytest.importorskip("oath")
T = 1