From 6c249f7ae890694f061bfde7a3ab52bf367be110 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Fri, 2 Nov 2012 15:04:05 -0700 Subject: move key loading to verifier code Add an option to verifier_test to load keys from a file, the way the recovery does. Change-Id: Icba0e391164f2c1a9fefeab4b0bcb878e91d17b4 --- verifier_test.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'verifier_test.cpp') diff --git a/verifier_test.cpp b/verifier_test.cpp index 01d092680..79c55783d 100644 --- a/verifier_test.cpp +++ b/verifier_test.cpp @@ -129,21 +129,26 @@ class FakeUI : public RecoveryUI { }; int main(int argc, char **argv) { - if (argc != 2 && argc != 3) { - fprintf(stderr, "Usage: %s [-f4] \n", argv[0]); + if (argc < 2 || argc > 4) { + fprintf(stderr, "Usage: %s [-f4 | -file ] \n", argv[0]); return 2; } RSAPublicKey* key = &test_key; + int num_keys = 1; ++argv; if (strcmp(argv[0], "-f4") == 0) { ++argv; key = &test_f4_key; + } else if (strcmp(argv[0], "-file") == 0) { + ++argv; + key = load_keys(argv[0], &num_keys); + ++argv; } ui = new FakeUI(); - int result = verify_file(*argv, key, 1); + int result = verify_file(*argv, key, num_keys); if (result == VERIFY_SUCCESS) { printf("SUCCESS\n"); return 0; -- cgit v1.2.3