/*
- * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* https://www.openssl.org/source/license.html
* or in the file LICENSE in the source distribution.
*/
-#include "e_os.h"
+#include "internal/nelem.h"
#include "testutil.h"
#include <stdio.h>
#define NUM_REPEATS "1000000"
-static int64_t num_repeats;
+static intmax_t num_repeats;
static int print_mode = 0;
#ifndef OPENSSL_NO_EC
* point multiplication.
* Returns the X-coordinate of the end result or NULL on error.
*/
-static BIGNUM *walk_curve(const EC_GROUP *group, EC_POINT *point, int64_t num)
+static BIGNUM *walk_curve(const EC_GROUP *group, EC_POINT *point, intmax_t num)
{
BIGNUM *scalar = NULL;
- int64_t i;
+ intmax_t i;
if (!TEST_ptr(scalar = BN_new())
- || !TEST_true(EC_POINT_get_affine_coordinates_GFp(group, point,
- scalar,
- NULL, NULL)))
+ || !TEST_true(EC_POINT_get_affine_coordinates(group, point, scalar,
+ NULL, NULL)))
goto err;
for (i = 0; i < num; i++) {
if (!TEST_true(EC_POINT_mul(group, point, NULL, point, scalar, NULL))
- || !TEST_true(EC_POINT_get_affine_coordinates_GFp(group, point,
- scalar,
- NULL, NULL)))
+ || !TEST_true(EC_POINT_get_affine_coordinates(group, point,
+ scalar,
+ NULL, NULL)))
goto err;
}
return scalar;
return NULL;
}
-static int test_curve()
+static int test_curve(void)
{
EC_GROUP *group = NULL;
EC_POINT *point = NULL;
}
#endif
-static int atoi64(const char *in, int64_t *result)
-{
- int64_t ret = 0;
-
- for ( ; *in != '\0'; in++) {
- char c = *in;
+typedef enum OPTION_choice {
+ OPT_ERR = -1,
+ OPT_EOF = 0,
+ OPT_NUM_REPEATS,
+ OPT_TEST_ENUM
+} OPTION_CHOICE;
- if (!isdigit(c))
- return 0;
- ret *= 10;
- ret += (c - '0');
- }
- *result = ret;
- return 1;
+const OPTIONS *test_get_options(void)
+{
+ static const OPTIONS test_options[] = {
+ OPT_TEST_OPTIONS_DEFAULT_USAGE,
+ { "num", OPT_NUM_REPEATS, 'M', "Number of repeats" },
+ { NULL }
+ };
+ return test_options;
}
/*
* |num| times and prints the resulting X-coordinate. Otherwise runs the test
* the default number of times and compares against the expected result.
*/
-int test_main(int argc, char *argv[])
+int setup_tests(void)
{
- const char *argv0 = argv[0];
+ OPTION_CHOICE o;
- if (!atoi64(NUM_REPEATS, &num_repeats)) {
+ if (!opt_imax(NUM_REPEATS, &num_repeats)) {
TEST_error("Cannot parse " NUM_REPEATS);
- return EXIT_FAILURE;
+ return 0;
}
- /*
- * TODO(openssl-team): code under test/ should be able to reuse the option
- * parsing framework currently in apps/.
- */
- argc--;
- argv++;
- while (argc >= 1) {
- if (strcmp(*argv, "-num") == 0) {
- if (--argc < 1
- || !atoi64(*++argv, &num_repeats)
- || num_repeats < 0) {
- TEST_error("Bad -num argument\n");
- return EXIT_FAILURE;
- }
+
+ while ((o = opt_next()) != OPT_EOF) {
+ switch (o) {
+ case OPT_NUM_REPEATS:
+ if (!opt_imax(opt_arg(), &num_repeats)
+ || num_repeats < 0)
+ return 0;
print_mode = 1;
- } else {
- TEST_error("Unknown option %s\n", *argv);
- return EXIT_FAILURE;
+ break;
+ case OPT_TEST_CASES:
+ break;
+ default:
+ case OPT_ERR:
+ return 0;
}
- argc--;
- argv++;
}
#ifndef OPENSSL_NO_EC
ADD_TEST(test_curve);
#endif
- return run_tests(argv0);
+ return 1;
}