From 867f13c6b77dbc8e9352f27a33bb281f43b2a041 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 18 Jun 2021 10:51:43 +1000 Subject: [PATCH] tests gen_digital_signature_tests: Fix mypy issues --- .../test/gen_digital_signature_tests.py | 11 ++++++----- tools/ci/mypy_ignore_list.txt | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/esp_hw_support/test/gen_digital_signature_tests.py b/components/esp_hw_support/test/gen_digital_signature_tests.py index 9e50c10466..d9ceee5476 100644 --- a/components/esp_hw_support/test/gen_digital_signature_tests.py +++ b/components/esp_hw_support/test/gen_digital_signature_tests.py @@ -8,11 +8,12 @@ import struct from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.asymmetric import rsa +from cryptography.hazmat.primitives.asymmetric.rsa import _modinv as modinv # type: ignore from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes from cryptography.utils import int_to_bytes -def number_as_bignum_words(number): +def number_as_bignum_words(number): # type: (int) -> str """ Given a number, format result as a C array of words (little-endian, same as ESP32 RSA peripheral or mbedTLS) @@ -24,17 +25,17 @@ def number_as_bignum_words(number): return '{ ' + ', '.join(result) + ' }' -def number_as_bytes(number, pad_bits=None): +def number_as_bytes(number, pad_bits=None): # type: (int, int) -> bytes """ Given a number, format as a little endian array of bytes """ - result = int_to_bytes(number)[::-1] + result = int_to_bytes(number)[::-1] # type: bytes while pad_bits is not None and len(result) < (pad_bits // 8): result += b'\x00' return result -def bytes_as_char_array(b): +def bytes_as_char_array(b): # type: (bytes) -> str """ Given a sequence of bytes, format as a char array """ @@ -96,7 +97,7 @@ with open('digital_signature_test_cases.h', 'w') as f: rr = 1 << (key_size * 2) rinv = rr % pub_numbers.n - mprime = - rsa._modinv(M, 1 << 32) + mprime = - modinv(M, 1 << 32) mprime &= 0xFFFFFFFF length = key_size // 32 - 1 diff --git a/tools/ci/mypy_ignore_list.txt b/tools/ci/mypy_ignore_list.txt index 65bce5e72d..84c2132cd0 100644 --- a/tools/ci/mypy_ignore_list.txt +++ b/tools/ci/mypy_ignore_list.txt @@ -3,7 +3,6 @@ components/efuse/efuse_table_gen.py components/efuse/test_efuse_host/efuse_tests.py components/esp_local_ctrl/python/esp_local_ctrl_pb2.py components/esp_netif/test_apps/component_ut_test.py -components/esp_hw_support/test/gen_digital_signature_tests.py components/espcoredump/corefile/elf.py components/espcoredump/corefile/gdb.py components/espcoredump/test/test_espcoredump.py