From 16bff4092a658b9cf8b9cbc7353ba86efa2a0d9f Mon Sep 17 00:00:00 2001 From: Elias Bonnici Date: Fri, 16 Aug 2024 16:26:20 +0200 Subject: [PATCH] Change `FipsStatus` to `FIPS_STATUS` for consistency --- tests/device/test_basic.py | 10 +++++----- yubihsm/core.py | 6 +++--- yubihsm/defs.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/device/test_basic.py b/tests/device/test_basic.py index 5a56716..6bf1b42 100644 --- a/tests/device/test_basic.py +++ b/tests/device/test_basic.py @@ -13,7 +13,7 @@ # limitations under the License. from yubihsm.core import MAX_MSG_SIZE -from yubihsm.defs import ALGORITHM, CAPABILITY, OBJECT, COMMAND, ORIGIN, FipsStatus +from yubihsm.defs import ALGORITHM, CAPABILITY, OBJECT, COMMAND, ORIGIN, FIPS_STATUS from yubihsm.objects import ( YhsmObject, AsymmetricKey, @@ -204,12 +204,12 @@ def session2(self, session, connect_hsm): pytest.skip("Non-FIPS YubiHSM") def test_set_in_fips_mode(self, session2, info): - assert session2.get_fips_status() == FipsStatus.OFF + assert session2.get_fips_status() == FIPS_STATUS.OFF session2.set_fips_mode(True) if info.version < (2, 4, 0): - assert session2.get_fips_status() == FipsStatus.ON + assert session2.get_fips_status() == FIPS_STATUS.ON else: - assert session2.get_fips_status() == FipsStatus.PENDING + assert session2.get_fips_status() == FIPS_STATUS.PENDING def test_fips_mode_disables_algorithms(self, session2, info): session2.set_fips_mode(True) @@ -246,7 +246,7 @@ def test_enabling_algorithms_in_fips_mode(self, session2, info): ALGORITHM.RSA_PKCS1_SHA1: True, } ) - assert session2.get_fips_mode() == FipsStatus.OFF + assert session2.get_fips_status() == FIPS_STATUS.OFF else: with pytest.raises(YubiHsmDeviceError): session2.set_enabled_algorithms({ALGORITHM.RSA_PKCS1_SHA1: True}) diff --git a/yubihsm/core.py b/yubihsm/core.py index e26f13e..1e9b39a 100644 --- a/yubihsm/core.py +++ b/yubihsm/core.py @@ -23,7 +23,7 @@ OPTION, AUDIT, ERROR, - FipsStatus, + FIPS_STATUS, ) from .backends import get_backend, YhsmBackend from .objects import YhsmObject, _label_pack, LABEL_LENGTH @@ -986,14 +986,14 @@ def set_fips_mode(self, mode: bool) -> None: """ self.put_option(OPTION.FIPS_MODE, struct.pack("!B", mode)) - def get_fips_status(self) -> FipsStatus: + def get_fips_status(self) -> FIPS_STATUS: """Get the current FIPS status. YubiHSM2 FIPS only. :return: The FipsStatus value. """ - return FipsStatus(self.get_option(OPTION.FIPS_MODE)[0]) + return FIPS_STATUS(self.get_option(OPTION.FIPS_MODE)[0]) def get_fips_mode(self) -> bool: """Get the current setting for FIPS mode. diff --git a/yubihsm/defs.py b/yubihsm/defs.py index 559b669..c38200b 100644 --- a/yubihsm/defs.py +++ b/yubihsm/defs.py @@ -322,7 +322,7 @@ class AUDIT(IntEnum): @unique -class FipsStatus(IntEnum): +class FIPS_STATUS(IntEnum): """Values for FIPS status""" OFF = 0x00