diff options
author | Vadim Sukhomlinov <sukhomlinov@google.com> | 2019-10-10 18:38:32 -0700 |
---|---|---|
committer | Vadim Sukhomlinov <sukhomlinov@chromium.org> | 2020-06-02 19:42:56 +0000 |
commit | 253388ec3a701a65a0c1ce70bcadc2cfb4626fef (patch) | |
tree | ee6ddc92c99a471e2115416e9125796890cb6d8b /test | |
parent | 1da8e0dd19cd7e7c16712fbf0deb00c9f4ad5889 (diff) | |
download | chrome-ec-253388ec3a701a65a0c1ce70bcadc2cfb4626fef.tar.gz |
cr50: Add support for ACVP tests of HMAC implementations
In order to support NIST ACVP testing, new commands to provide access to
HMAC implementations (software, and hardware accelerated HMAC SHA-256)
with CRYPTO_TEST_SETUP added:
- Software HMAC (_cpri_StartHMAC) TPM implementation
- dcrypto HMAC (DCRYPTO_HMAC_SHA256_init)
Updated hash_test.py to support different hash algorithms for hash
and HMAC, added HMAC tests.
BRANCH=cr50
TEST=make BOARD=cr50 CRYPTO_TEST=1 -j && test/tpm_test/tpmtest.py
BUG=b:138578319
Change-Id: I57da2f27734fc7e5dbc896d75c5f8b2ed60e3b18
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1854885
Reviewed-by: Gurleen Grewal <gurleengrewal@google.com>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Gurleen Grewal <gurleengrewal@google.com>
(cherry picked from commit 32c349afe72541570984a32bd85b8f1fcf2acb39)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2227074
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/tpm_test/hash_test.py | 129 |
1 files changed, 86 insertions, 43 deletions
diff --git a/test/tpm_test/hash_test.py b/test/tpm_test/hash_test.py index 821f79e4a1..9f10894d2e 100644 --- a/test/tpm_test/hash_test.py +++ b/test/tpm_test/hash_test.py @@ -8,43 +8,70 @@ from __future__ import print_function import hashlib +import hmac import struct import subcmd import utils # Hash command modes -CMD_START = 0 -CMD_CONT = 1 -CMD_FINISH = 2 -CMD_SINGLE = 3 +CMD_HASH_START = 0 +CMD_HASH_CONT = 1 +CMD_HASH_FINISH = 2 +CMD_HASH = 3 +CMD_HMAC_SW = 4 +CMD_HMAC_HW = 5 -# Hash modes -MODE_SHA1 = 0 -MODE_SHA256 = 1 + +# Hash algorithm +ALG_SHA1 = 0 +ALG_SHA256 = 1 +ALG_SHA384 = 2 +ALG_SHA512 = 3 # A standard empty response to HASH extended commands. EMPTY_RESPONSE = ''.join('%c' % x for x in (0x80, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01)) test_inputs = ( - # SHA mode cmd mode handle text - (MODE_SHA1, 'single', 0, ''), - (MODE_SHA256, 'single', 0, ''), - (MODE_SHA1, 'single', 0, 'anything really will work here'), - (MODE_SHA256, 'single', 0, 'some more text, this time for sha256'), - (MODE_SHA256, 'start', 1, 'some more text, this time for sha256'), - (MODE_SHA256, 'cont', 1, 'some more text, this time for sha256'), - (MODE_SHA256, 'start', 2, 'this could be anything, we just need to'), - (MODE_SHA1, 'single', 3, 'interleave a SHA1 single calculation'), - (MODE_SHA256, 'single', 3, 'interleave a SHA256 single calculation'), - (MODE_SHA1, 'start', 3, 'let\'s interleave a sha1 calculation'), - (MODE_SHA256, 'cont', 2, 'fill up a second context with something'), - (MODE_SHA256, 'cont', 1, 'let\'s feed some more into context 1'), - (MODE_SHA256, 'finish', 1, 'some more text, this time for sha256'), - (MODE_SHA1, 'cont', 3, 'with two active sha256 calculations'), - (MODE_SHA1, 'finish', 3, 'this should be enough'), - (MODE_SHA256, 'finish', 2, 'it does not really matter what'), + # Hash cmd alg handle hmac_key text + (CMD_HMAC_SW, ALG_SHA256, 0, 'hmac_key1', 'some text, this time for sw hmac'), + (CMD_HMAC_SW, ALG_SHA1, 0, 'hmac_key2', 'some text, this time for sw hmac'), + (CMD_HMAC_SW, ALG_SHA384, 0, 'hmac_key3', 'some text, this time for sw hmac'), + (CMD_HMAC_SW, ALG_SHA512, 0, 'hmac_key4', 'some text, this time for sw hmac'), + (CMD_HMAC_HW, ALG_SHA256, 0, 'hmac_key5', 'some text, this time for hw hmac'), + (CMD_HMAC_SW, ALG_SHA256, 0, 'very long hmac_key 456456789012345', ' text'), + (CMD_HMAC_HW, ALG_SHA256, 0, 'very long hmac_key 123456789012345', ' text'), + (CMD_HMAC_SW, ALG_SHA384, 0, 'very long hmac_key 456456789012345', ' text'), + (CMD_HMAC_SW, ALG_SHA512, 0, 'very long hmac_key 456456789012345', ' text'), + (CMD_HASH, ALG_SHA1, 0, '', ''), + (CMD_HASH, ALG_SHA256, 0, '', ''), + (CMD_HASH, ALG_SHA1, 0, '', 'anything really will work here'), + (CMD_HASH, ALG_SHA256, 0, '', 'some more text, this time for sha256'), + (CMD_HASH_START, ALG_SHA256, 1, '', 'some more text, this time for sha256'), + (CMD_HASH_CONT, ALG_SHA256, 1, '', 'some more text, this time for sha256'), + (CMD_HASH_START, ALG_SHA256, 2, '', 'this could be anything here'), + (CMD_HASH, ALG_SHA1, 3, '', 'interleave a SHA1 single shot'), + (CMD_HASH, ALG_SHA256, 3, '', 'interleave a SHA256 single shot'), + (CMD_HASH_START, ALG_SHA1, 3, '', 'let\'s interleave a sha1 calculation'), + (CMD_HASH_CONT, ALG_SHA256, 2, '', 'fill up a second context with data'), + (CMD_HASH_CONT, ALG_SHA256, 1, '', 'let\'s feed some more into context 1'), + (CMD_HASH_FINISH, ALG_SHA256, 1, '', 'some more text, this time for sha256'), + (CMD_HASH_CONT, ALG_SHA1, 3, '', 'with two active sha256 calculations'), + (CMD_HASH_FINISH, ALG_SHA1, 3, '', 'this should be enough'), + (CMD_HASH_FINISH, ALG_SHA256, 2, '', 'it does not really matter what'), + (CMD_HASH, ALG_SHA384, 0, '', 'some more text, this time for sha384'), + (CMD_HASH, ALG_SHA512, 0, '', 'some more text, this time for sha512'), + (CMD_HASH_START, ALG_SHA256, 0, '', 'some more text, this time for sha256'), + (CMD_HASH_START, ALG_SHA384, 1, '', 'some more text, this time for sha384'), + (CMD_HASH_CONT, ALG_SHA384, 1, '', 'some more text, this time for sha384'), + (CMD_HASH_CONT, ALG_SHA256, 0, '', 'some more text, this time for sha256'), + (CMD_HASH_START, ALG_SHA512, 2, '', 'some more text, this time for sha512'), + (CMD_HASH_CONT, ALG_SHA512, 2, '', 'some more text, this time for sha512'), + (CMD_HASH_FINISH, ALG_SHA512, 2, '', 'this should be enough'), + (CMD_HASH_FINISH, ALG_SHA256, 0, '', 'this should be enough'), + (CMD_HASH_FINISH, ALG_SHA384, 1, '', 'this should be enough'), ) + def hash_test(tpm): """Exercise multiple hash threads simultaneously. @@ -52,12 +79,16 @@ def hash_test(tpm): field | size | note =================================================================== - hash_cmd | 1 | 0 - start, 1 - cont., 2 - finish, 4 - single - hash_mode | 1 | 0 - sha1, 1 - sha256 + hash_cmd | 1 | 0 - start, 1 - cont., 2 - finish, 3 - single + | | 4 - SW HMAC single shot (TPM code) + | | 5 - HW HMAC SHA256 single shot (dcrypto code) + hash_alg | 1 | 0 - sha1, 1 - sha256, 2 - sha384, 3 - sha512 handle | 1 | session handle, ignored in 'single' mode text_len | 2 | size of the text to process, big endian text | text_len | text to hash - + for HMAC single shot only: + key_len | 2 | size of the key for HMAC, big endian + key | key_len | key for HMAC single shot Args: tpm: a tpm object used to communicate with the device @@ -67,33 +98,42 @@ def hash_test(tpm): contexts = {} - function_map = { - MODE_SHA1: ('sha1', hashlib.sha1), - MODE_SHA256: ('sha256', hashlib.sha256) + alg_map = { + ALG_SHA1: ('sha1', hashlib.sha1), + ALG_SHA256: ('sha256', hashlib.sha256), + ALG_SHA384: ('sha384', hashlib.sha384), + ALG_SHA512: ('sha512', hashlib.sha512), } cmd_map = { - 'start': CMD_START, - 'cont': CMD_CONT, - 'finish': CMD_FINISH, - 'single': CMD_SINGLE + CMD_HASH_START: 'hash start', + CMD_HASH_CONT: 'hash cont', + CMD_HASH_FINISH: 'hash finish', + CMD_HASH: 'hash', + CMD_HMAC_SW: 'hmac sw', + CMD_HMAC_HW: 'hmac hw' } for test in test_inputs: - hash_mode, cmd_name, handle, text = test + hash_cmd, hash_alg, handle, hmac_key, text = test + mode_name = cmd_map[hash_cmd] + alg_name, hash_func = alg_map[hash_alg] - mode_name, hash_func = function_map[hash_mode] - hash_cmd = cmd_map[cmd_name] - test_name = '%s:%s:%d' % (mode_name, cmd_name, handle) + test_name = '%s:%s:%d' % (mode_name, alg_name, handle) cmd = '%c' % hash_cmd - cmd += '%c' % hash_mode + cmd += '%c' % hash_alg cmd += '%c' % handle # Ignored for single shots + cmd += struct.pack('>H', len(text)) cmd += text + # for HMAC add key + if hash_cmd in (CMD_HMAC_SW, CMD_HMAC_HW): + cmd += struct.pack('>H', len(hmac_key)) + cmd += hmac_key wrapped_response = tpm.command(tpm.wrap_ext_command(subcmd.HASH, cmd)) - if hash_cmd in (CMD_START, CMD_CONT): - if hash_cmd == CMD_START: + if hash_cmd in (CMD_HASH_START, CMD_HASH_CONT): + if hash_cmd == CMD_HASH_START: contexts[handle] = hash_func() h = contexts[handle] h.update(text) @@ -101,10 +141,12 @@ def hash_test(tpm): raise subcmd.TpmTestError("Unexpected response to '%s': %s" % (test_name, utils.hex_dump(wrapped_response))) continue - if hash_cmd == CMD_FINISH: + if hash_cmd == CMD_HASH_FINISH: h = contexts[handle] - elif hash_cmd == CMD_SINGLE: + elif hash_cmd == CMD_HASH: h = hash_func() + elif hash_cmd in (CMD_HMAC_SW, CMD_HMAC_HW): + h = hmac.new(bytes(hmac_key), digestmod=hash_func) else: raise subcmd.TpmTestError('Unknown command %d' % hash_cmd) h.update(text) @@ -114,4 +156,5 @@ def hash_test(tpm): raise subcmd.TpmTestError('%s error:%s%s' % (test_name, utils.hex_dump(digest), utils.hex_dump(result))) + print('%sSUCCESS: %s' % (utils.cursor_back(), test_name)) |