summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/vb20_common2_tests.c13
-rw-r--r--tests/vb20_common3_tests.c10
-rw-r--r--tests/vb21_common2_tests.c12
-rw-r--r--tests/vb2_rsa_utility_tests.c2
-rw-r--r--tests/vboot_common_tests.c3
5 files changed, 24 insertions, 16 deletions
diff --git a/tests/vb20_common2_tests.c b/tests/vb20_common2_tests.c
index 671fa9fe..00861e58 100644
--- a/tests/vb20_common2_tests.c
+++ b/tests/vb20_common2_tests.c
@@ -13,6 +13,7 @@
#include "2rsa.h"
#include "file_keys.h"
#include "host_common.h"
+#include "host_key2.h"
#include "vb2_common.h"
#include "vboot_common.h"
#include "test_common.h"
@@ -138,7 +139,8 @@ static void test_verify_data(const struct vb2_packed_key *key1,
int test_algorithm(int key_algorithm, const char *keys_dir)
{
char filename[1024];
- int rsa_len = siglen_map[key_algorithm] * 8;
+ int rsa_bits = 8 * vb2_rsa_sig_size(
+ vb2_crypto_to_signature(key_algorithm));
struct vb2_private_key *private_key = NULL;
struct vb2_signature *sig = NULL;
@@ -146,10 +148,11 @@ int test_algorithm(int key_algorithm, const char *keys_dir)
int retval = 1;
- printf("***Testing algorithm: %s\n", algo_strings[key_algorithm]);
+ printf("***Testing algorithm: %s\n",
+ vb2_get_crypto_algorithm_name(key_algorithm));
snprintf(filename, sizeof(filename),
- "%s/key_rsa%d.pem", keys_dir, rsa_len);
+ "%s/key_rsa%d.pem", keys_dir, rsa_bits);
private_key = vb2_read_private_key_pem(filename, key_algorithm);
if (!private_key) {
fprintf(stderr, "Error reading private_key: %s\n", filename);
@@ -157,7 +160,7 @@ int test_algorithm(int key_algorithm, const char *keys_dir)
}
snprintf(filename, sizeof(filename),
- "%s/key_rsa%d.keyb", keys_dir, rsa_len);
+ "%s/key_rsa%d.keyb", keys_dir, rsa_bits);
key1 = vb2_read_packed_keyb(filename, key_algorithm, 1);
if (!key1) {
fprintf(stderr, "Error reading public_key: %s\n", filename);
@@ -208,7 +211,7 @@ int main(int argc, char *argv[]) {
/* Test all the algorithms */
int alg;
- for (alg = 0; alg < kNumAlgorithms; alg++) {
+ for (alg = 0; alg < VB2_ALG_COUNT; alg++) {
if (test_algorithm(alg, argv[1]))
return 1;
}
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c
index b4e5bf5e..e5538673 100644
--- a/tests/vb20_common3_tests.c
+++ b/tests/vb20_common3_tests.c
@@ -515,8 +515,10 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm,
const char *keys_dir)
{
char filename[1024];
- int signing_rsa_len = siglen_map[signing_key_algorithm] * 8;
- int data_rsa_len = siglen_map[data_key_algorithm] * 8;
+ 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;
@@ -524,9 +526,9 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm,
struct vb2_packed_key *data_public_key = NULL;
printf("***Testing signing algorithm: %s\n",
- algo_strings[signing_key_algorithm]);
+ vb2_get_crypto_algorithm_name(signing_key_algorithm));
printf("***With data key algorithm: %s\n",
- algo_strings[data_key_algorithm]);
+ vb2_get_crypto_algorithm_name(data_key_algorithm));
snprintf(filename, sizeof(filename),
"%s/key_rsa%d.pem", keys_dir, signing_rsa_len);
diff --git a/tests/vb21_common2_tests.c b/tests/vb21_common2_tests.c
index 15e4d505..b121fa5a 100644
--- a/tests/vb21_common2_tests.c
+++ b/tests/vb21_common2_tests.c
@@ -239,7 +239,8 @@ static void test_verify_data(const struct vb2_public_key *pubk_orig,
int test_algorithm(int key_algorithm, const char *keys_dir)
{
char filename[1024];
- int rsa_len = siglen_map[key_algorithm] * 8;
+ int rsa_bits = 8 * vb2_rsa_sig_size(
+ vb2_crypto_to_signature(key_algorithm));
enum vb2_signature_algorithm sig_alg =
vb2_crypto_to_signature(key_algorithm);
@@ -250,10 +251,11 @@ int test_algorithm(int key_algorithm, const char *keys_dir)
struct vb2_public_key *pubk = NULL;
struct vb21_packed_key *key2 = NULL;
- printf("***Testing algorithm: %s\n", algo_strings[key_algorithm]);
+ printf("***Testing algorithm: %s\n",
+ vb2_get_crypto_algorithm_name(key_algorithm));
snprintf(filename, sizeof(filename),
- "%s/key_rsa%d.pem", keys_dir, rsa_len);
+ "%s/key_rsa%d.pem", keys_dir, rsa_bits);
TEST_SUCC(vb2_private_key_read_pem(&prik, filename),
"Read private key");
prik->hash_alg = hash_alg;
@@ -261,7 +263,7 @@ int test_algorithm(int key_algorithm, const char *keys_dir)
vb2_private_key_set_desc(prik, "private key");
snprintf(filename, sizeof(filename),
- "%s/key_rsa%d.keyb", keys_dir, rsa_len);
+ "%s/key_rsa%d.keyb", keys_dir, rsa_bits);
TEST_SUCC(vb2_public_key_read_keyb(&pubk, filename),
"Read public key");
pubk->hash_alg = hash_alg;
@@ -305,7 +307,7 @@ int main(int argc, char *argv[]) {
/* Test all the algorithms */
int alg;
- for (alg = 0; alg < kNumAlgorithms; alg++) {
+ for (alg = 0; alg < VB2_ALG_COUNT; alg++) {
if (test_algorithm(alg, argv[1]))
return 1;
}
diff --git a/tests/vb2_rsa_utility_tests.c b/tests/vb2_rsa_utility_tests.c
index 99282bf7..df603272 100644
--- a/tests/vb2_rsa_utility_tests.c
+++ b/tests/vb2_rsa_utility_tests.c
@@ -40,7 +40,7 @@ static void test_utils(void)
.hash_alg = VB2_HASH_INVALID};
/* Verify old and new algorithm count constants match */
- TEST_EQ(kNumAlgorithms, VB2_ALG_COUNT, "Algorithm counts");
+ TEST_EQ(VB2_ALG_COUNT, VB2_ALG_COUNT, "Algorithm counts");
/* Crypto algorithm to sig algorithm mapping */
TEST_EQ(vb2_crypto_to_signature(VB2_ALG_RSA1024_SHA1),
diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c
index d5494d42..8e005260 100644
--- a/tests/vboot_common_tests.c
+++ b/tests/vboot_common_tests.c
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include "host_common.h"
#include "test_common.h"
#include "utility.h"
#include "vboot_common.h"
@@ -154,7 +155,7 @@ static void PublicKeyTest(void)
PublicKeyInit(k, (uint8_t*)(k + 1), 2 * sizeof(VbPublicKey));
TEST_EQ(k->key_offset, sizeof(VbPublicKey), "PublicKeyInit key_offset");
TEST_EQ(k->key_size, 2 * sizeof(VbPublicKey), "PublicKeyInit key_size");
- TEST_EQ(k->algorithm, kNumAlgorithms, "PublicKeyInit algorithm");
+ TEST_EQ(k->algorithm, VB2_ALG_COUNT, "PublicKeyInit algorithm");
TEST_EQ(k->key_version, 0, "PublicKeyInit key_version");
/* Set algorithm and version, so we can tell if they get copied */
View Lorry Controller Status