/*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * 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
* t: API type, "cert" for X509_ and "req" for X509_REQ_ APIs.
* e: expected, "ok" for success, "failed" for what should fail.
*/
-static int test_x509_check_cert_pkey(const char *c, const char *k,
- const char *t, const char *e)
+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;
if (strcmp(e, "ok") == 0) {
expected = 1;
} else if (strcmp(e, "failed") == 0) {
- expected = 2;
+ expected = 0;
} else {
TEST_error("invalid 'expected'");
goto failed;
}
/* process private key */
- bio = BIO_new_file(k, "r");
- if (bio == NULL) {
- TEST_error("create BIO for private key failed");
+ if (!TEST_ptr(bio = BIO_new_file(k, "r")))
goto failed;
- }
- pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL);
- if (pkey == NULL) {
- TEST_error("read PEM private key 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 */
- bio = BIO_new_file(c, "r");
- if (bio == NULL) {
- TEST_error("create BIO for cert or cert req failed");
+ 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 (expected == 1) {
- /* expected == 1 means we expect an "ok" */
- if (!TEST_int_eq(result, 1)) {
- TEST_error("check private key: expected: 1, got: %d", result);
+ case 1:
+ x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+ if (x509 == NULL) {
+ TEST_error("read PEM x509 failed");
goto failed;
}
- } else {
- if (!TEST_int_eq(result, 0)) {
- TEST_error("check private key: expected: 0, got: %d", result);
+
+ 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;
}
-out:
- if (bio)
- BIO_free(bio);
- if (x509)
- X509_free(x509);
- if (x509_req)
- X509_REQ_free(x509_req);
- if (pkey)
- EVP_PKEY_free(pkey);
- return ret;
+ if (!TEST_int_eq(result, expected)) {
+ TEST_error("check private key: expected: %d, got: %d", expected, result);
+ goto failed;
+ }
-failed:
ret = 1;
- goto out;
+failed:
+ BIO_free(bio);
+ X509_free(x509);
+ X509_REQ_free(x509_req);
+ EVP_PKEY_free(pkey);
+ return ret;
}
-int test_main(int argc, char **argv)
+const OPTIONS *test_get_options(void)
{
- if (!TEST_int_eq(argc, 5)) {
- TEST_info("usage: x509_check_cert_pkey cert.pem|cert.req"
- " key.pem cert|req <expected>");
- return 1;
+ 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;
}
- return test_x509_check_cert_pkey(argv[1], argv[2], argv[3], argv[4]);
+ ADD_TEST(test_x509_check_cert_pkey);
+ return 1;
}