diff options
| author | Caveh Jalali <caveh@google.com> | 2017-08-19 12:25:42 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-08-24 01:25:50 -0700 |
| commit | a9cbc267362c71005790cf5b7ca6a8f8d864cea0 (patch) | |
| tree | cf8349b2dff4fa1510bdac07f31772434451bce2 /tests/vb20_common3_tests.c | |
| parent | b2b3970923b7971acf78b11d5678ddc3a3a23521 (diff) | |
| download | vboot-a9cbc267362c71005790cf5b7ca6a8f8d864cea0.tar.gz | |
tests: Add support for exponent 3 keys
BRANCH=none
BUG=b:64854892
TEST=make runlongtests
Change-Id: I827ce47b68339dc4df7f84b26a0b6643af27037b
Signed-off-by: Caveh Jalali <caveh@google.com>
Reviewed-on: https://chromium-review.googlesource.com/628176
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'tests/vb20_common3_tests.c')
| -rw-r--r-- | tests/vb20_common3_tests.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c index b5ad1ebe..5533124a 100644 --- a/tests/vb20_common3_tests.c +++ b/tests/vb20_common3_tests.c @@ -513,10 +513,6 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, const char *keys_dir) { char filename[1024]; - int signing_rsa_len = 8 * vb2_rsa_sig_size( - vb2_crypto_to_signature(signing_key_algorithm)); - int data_rsa_len = 8 * vb2_rsa_sig_size( - vb2_crypto_to_signature(data_key_algorithm)); int retval = 1; struct vb2_private_key *signing_private_key = NULL; @@ -528,8 +524,9 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, printf("***With data key algorithm: %s\n", vb2_get_crypto_algorithm_name(data_key_algorithm)); - snprintf(filename, sizeof(filename), - "%s/key_rsa%d.pem", keys_dir, signing_rsa_len); + snprintf(filename, sizeof(filename), "%s/key_%s.pem", + keys_dir, + vb2_get_crypto_algorithm_file(signing_key_algorithm)); signing_private_key = vb2_read_private_key_pem(filename, signing_key_algorithm); if (!signing_private_key) { @@ -538,8 +535,9 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, goto cleanup_permutation; } - snprintf(filename, sizeof(filename), - "%s/key_rsa%d.keyb", keys_dir, signing_rsa_len); + snprintf(filename, sizeof(filename), "%s/key_%s.keyb", + keys_dir, + vb2_get_crypto_algorithm_file(signing_key_algorithm)); signing_public_key = vb2_read_packed_keyb(filename, signing_key_algorithm, 1); if (!signing_public_key) { @@ -548,8 +546,9 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, goto cleanup_permutation; } - snprintf(filename, sizeof(filename), - "%s/key_rsa%d.keyb", keys_dir, data_rsa_len); + snprintf(filename, sizeof(filename), "%s/key_%s.keyb", + keys_dir, + vb2_get_crypto_algorithm_file(data_key_algorithm)); data_public_key = vb2_read_packed_keyb(filename, data_key_algorithm, 1); if (!data_public_key) { |