diff options
Diffstat (limited to 'test/tpm_test/hkdf_test.py')
| -rw-r--r-- | test/tpm_test/hkdf_test.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/test/tpm_test/hkdf_test.py b/test/tpm_test/hkdf_test.py index 8fe8fe8b56..ab1c87301a 100644 --- a/test/tpm_test/hkdf_test.py +++ b/test/tpm_test/hkdf_test.py @@ -6,7 +6,6 @@ """Module for testing HKDF using extended commands.""" from binascii import a2b_hex as a2b -from struct import pack import subcmd import utils @@ -32,18 +31,11 @@ _HKDF_OPCODES = { # INFO_LEN INFO # 1 MSB OKM LEN # 1 LSB OKM LEN -# -_HKDF_CMD_FORMAT = '{op:c}{sl:s}{salt}{ikml:s}{ikm}{infol:s}{info}{okml:s}' - - def _rfc_test_cmd(salt, ikm, info, okml): - hkdf_op = _HKDF_OPCODES['TEST_RFC'] - return _HKDF_CMD_FORMAT.format(op=hkdf_op, - sl=pack('>H', len(salt)), salt=salt, - ikml=pack('>H', len(ikm)), ikm=ikm, - infol=pack('>H', len(info)), info=info, - okml=pack('>H', okml)) - + return _HKDF_OPCODES['TEST_RFC'].to_bytes(1, 'big') + \ + len(salt).to_bytes(2, 'big') + salt + \ + len(ikm).to_bytes(2, 'big') + ikm + \ + len(info).to_bytes(2, 'big') + info + okml.to_bytes(2, 'big') # # Test vectors for HKDF-SHA256 from RFC 5869. |