mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
8d242823ed
PR#6975 added the ability to our test framework to have common options to all tests. For example providing the option "-test 5" to one of our test programs will just run test number 5. This can be useful when debugging tests. Unforuntately this does not work well for a number of tests. In particular those tests that call test_get_argument() without first skipping over these common test options will not get the expected value. Some tests did this correctly but a large number did not. A helper function is introduced, test_skip_common_options(), to make this easier for those tests which do not have their own specialised test option handling, but yet still need to call test_get_argument(). This function call is then added to all those tests that need it. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10975)
140 lines
3.6 KiB
C
140 lines
3.6 KiB
C
/*
|
|
* Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <openssl/pem.h>
|
|
#include <openssl/x509.h>
|
|
#include "testutil.h"
|
|
|
|
/*
|
|
* c: path of a cert in PEM format
|
|
* k: path of a key in PEM format
|
|
* t: API type, "cert" for X509_ and "req" for X509_REQ_ APIs.
|
|
* e: expected, "ok" for success, "failed" for what should fail.
|
|
*/
|
|
static const char *c;
|
|
static const char *k;
|
|
static const char *t;
|
|
static const char *e;
|
|
|
|
static int test_x509_check_cert_pkey(void)
|
|
{
|
|
BIO *bio = NULL;
|
|
X509 *x509 = NULL;
|
|
X509_REQ *x509_req = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
int ret = 0, type = 0, expected = 0, result = 0;
|
|
|
|
/*
|
|
* we check them first thus if fails we don't need to do
|
|
* those PEM parsing operations.
|
|
*/
|
|
if (strcmp(t, "cert") == 0) {
|
|
type = 1;
|
|
} else if (strcmp(t, "req") == 0) {
|
|
type = 2;
|
|
} else {
|
|
TEST_error("invalid 'type'");
|
|
goto failed;
|
|
}
|
|
|
|
if (strcmp(e, "ok") == 0) {
|
|
expected = 1;
|
|
} else if (strcmp(e, "failed") == 0) {
|
|
expected = 0;
|
|
} else {
|
|
TEST_error("invalid 'expected'");
|
|
goto failed;
|
|
}
|
|
|
|
/* process private key */
|
|
if (!TEST_ptr(bio = BIO_new_file(k, "r")))
|
|
goto failed;
|
|
|
|
if (!TEST_ptr(pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL)))
|
|
goto failed;
|
|
|
|
BIO_free(bio);
|
|
|
|
/* process cert or cert request, use the same local var */
|
|
if (!TEST_ptr(bio = BIO_new_file(c, "r")))
|
|
goto failed;
|
|
|
|
switch (type) {
|
|
case 1:
|
|
x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
|
|
if (x509 == NULL) {
|
|
TEST_error("read PEM x509 failed");
|
|
goto failed;
|
|
}
|
|
|
|
result = X509_check_private_key(x509, pkey);
|
|
break;
|
|
case 2:
|
|
x509_req = PEM_read_bio_X509_REQ(bio, NULL, NULL, NULL);
|
|
if (x509_req == NULL) {
|
|
TEST_error("read PEM x509 req failed");
|
|
goto failed;
|
|
}
|
|
|
|
result = X509_REQ_check_private_key(x509_req, pkey);
|
|
break;
|
|
default:
|
|
/* should never be here */
|
|
break;
|
|
}
|
|
|
|
if (!TEST_int_eq(result, expected)) {
|
|
TEST_error("check private key: expected: %d, got: %d", expected, result);
|
|
goto failed;
|
|
}
|
|
|
|
ret = 1;
|
|
failed:
|
|
BIO_free(bio);
|
|
X509_free(x509);
|
|
X509_REQ_free(x509_req);
|
|
EVP_PKEY_free(pkey);
|
|
return ret;
|
|
}
|
|
|
|
const OPTIONS *test_get_options(void)
|
|
{
|
|
enum { OPT_TEST_ENUM };
|
|
static const OPTIONS test_options[] = {
|
|
OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("cert key type expected\n"),
|
|
{ OPT_HELP_STR, 1, '-', "cert\tcertificate or CSR filename in PEM\n" },
|
|
{ OPT_HELP_STR, 1, '-', "key\tprivate key filename in PEM\n" },
|
|
{ OPT_HELP_STR, 1, '-', "type\t\tvalue must be 'cert' or 'req'\n" },
|
|
{ OPT_HELP_STR, 1, '-', "expected\tthe expected return value, either 'ok' or 'failed'\n" },
|
|
{ NULL }
|
|
};
|
|
return test_options;
|
|
}
|
|
|
|
int setup_tests(void)
|
|
{
|
|
if (!test_skip_common_options()) {
|
|
TEST_error("Error parsing test options\n");
|
|
return 0;
|
|
}
|
|
|
|
if (!TEST_ptr(c = test_get_argument(0))
|
|
|| !TEST_ptr(k = test_get_argument(1))
|
|
|| !TEST_ptr(t = test_get_argument(2))
|
|
|| !TEST_ptr(e = test_get_argument(3))) {
|
|
return 0;
|
|
}
|
|
|
|
ADD_TEST(test_x509_check_cert_pkey);
|
|
return 1;
|
|
}
|