diff options
author | Sergei Trofimov <sergei.trofimov@arm.com> | 2019-04-25 08:05:52 +0100 |
---|---|---|
committer | Tamas Ban <tamas.ban@arm.com> | 2019-07-17 10:28:51 +0000 |
commit | 55b61ebe7e5ddf1ee8b613350556d01a41d8236a (patch) | |
tree | 31d92336cb87d04c63a89424114631139bb29191 /tools/iat-verifier | |
parent | ad6d1bcd232b90bd927d1379026deb20f2be285b (diff) | |
download | trusted-firmware-m-55b61ebe7e5ddf1ee8b613350556d01a41d8236a.tar.gz |
Tools: iatverifier PEP 8 fixes
Change-Id: Idc659c6e6c5f96f150ef68384256f459bf14635d
Signed-off-by: Sergei Trofimov <sergei.trofimov@arm.com>
Diffstat (limited to 'tools/iat-verifier')
-rwxr-xr-x | tools/iat-verifier/dev_scripts/generate-key.py | 4 | ||||
-rwxr-xr-x | tools/iat-verifier/dev_scripts/generate-sample-iat.py | 4 | ||||
-rw-r--r-- | tools/iat-verifier/iatverifier/const.py | 5 | ||||
-rw-r--r-- | tools/iat-verifier/iatverifier/util.py | 7 | ||||
-rw-r--r-- | tools/iat-verifier/iatverifier/verify.py | 7 | ||||
-rw-r--r-- | tools/iat-verifier/setup.py | 4 | ||||
-rw-r--r-- | tools/iat-verifier/tests/test_verifier.py | 5 |
7 files changed, 18 insertions, 18 deletions
diff --git a/tools/iat-verifier/dev_scripts/generate-key.py b/tools/iat-verifier/dev_scripts/generate-key.py index f653ffdc3c..6c1eee7959 100755 --- a/tools/iat-verifier/dev_scripts/generate-key.py +++ b/tools/iat-verifier/dev_scripts/generate-key.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- import sys diff --git a/tools/iat-verifier/dev_scripts/generate-sample-iat.py b/tools/iat-verifier/dev_scripts/generate-sample-iat.py index 3d69a12ecd..c6311e6624 100755 --- a/tools/iat-verifier/dev_scripts/generate-sample-iat.py +++ b/tools/iat-verifier/dev_scripts/generate-sample-iat.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- import base64 import struct diff --git a/tools/iat-verifier/iatverifier/const.py b/tools/iat-verifier/iatverifier/const.py index cb7f7969e7..b0c915f8b1 100644 --- a/tools/iat-verifier/iatverifier/const.py +++ b/tools/iat-verifier/iatverifier/const.py @@ -1,9 +1,9 @@ -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # IAT custom claims ARM_RANGE = -75000 @@ -99,4 +99,3 @@ SL_NAMES = [ ] SL_SHIFT = 12 - diff --git a/tools/iat-verifier/iatverifier/util.py b/tools/iat-verifier/iatverifier/util.py index 6734d6454d..367fbef3c8 100644 --- a/tools/iat-verifier/iatverifier/util.py +++ b/tools/iat-verifier/iatverifier/util.py @@ -1,9 +1,9 @@ -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- from collections.abc import Iterable from copy import deepcopy @@ -123,7 +123,8 @@ def _parse_raw_token(raw): raise ValueError(msg) if key == const.SECURITY_LIFECYCLE: - value = (const.SL_NAMES.index(raw_value.upper()) + 1) << const.SL_SHIFT + name_idx = const.SL_NAMES.index(raw_value.upper()) + value = (name_idx + 1) << const.SL_SHIFT elif hasattr(raw_value, 'items'): value = _parse_raw_token(raw_value) elif (isinstance(raw_value, Iterable) and diff --git a/tools/iat-verifier/iatverifier/verify.py b/tools/iat-verifier/iatverifier/verify.py index 200447b9a2..abb3715f37 100644 --- a/tools/iat-verifier/iatverifier/verify.py +++ b/tools/iat-verifier/iatverifier/verify.py @@ -1,9 +1,9 @@ -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- import argparse import base64 @@ -249,7 +249,8 @@ def decode_and_validate_iat(encoded_iat, keep_going=False): keep_going) elif entry_name == 'SECURITY_LIFECYCLE': try: - token[entry_name] = const.SL_NAMES[(value >> const.SL_SHIFT) - 1] + name_idx = (value >> const.SL_SHIFT) - 1 + token[entry_name] = const.SL_NAMES[name_idx] except IndexError: token[entry_name] = 'CUSTOM({})'.format(value) else: # not SW_COMPONENT or SECURITY_LIFECYCLE diff --git a/tools/iat-verifier/setup.py b/tools/iat-verifier/setup.py index 30180d18af..7013262175 100644 --- a/tools/iat-verifier/setup.py +++ b/tools/iat-verifier/setup.py @@ -1,9 +1,9 @@ -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- from setuptools import setup diff --git a/tools/iat-verifier/tests/test_verifier.py b/tools/iat-verifier/tests/test_verifier.py index e6d8cc8d8f..c15a8ba904 100644 --- a/tools/iat-verifier/tests/test_verifier.py +++ b/tools/iat-verifier/tests/test_verifier.py @@ -1,9 +1,9 @@ -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # Copyright (c) 2019, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -#------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- import os import sys @@ -84,4 +84,3 @@ class TestIatVerifier(unittest.TestCase): def test_security_lifecycle_decoding(self): iat = create_and_read_iat('valid-iat.yaml', KEYFILE) self.assertEqual(iat['SECURITY_LIFECYCLE'], 'SL_SECURED') - |