diff options
author | Matt Caswell <matt@openssl.org> | 2019-05-01 11:02:43 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-05-02 22:42:09 +0100 |
commit | 1aedc35fd6c2f40f269c88b2f7d5a617172b47c5 (patch) | |
tree | 705bc6f55fe9571651b27af36c3a9a3ce1bc6ea1 /test/property_test.c | |
parent | b8fe36fee000970dcb7cd363f31445969cfbf677 (diff) |
Instead of global data store it in an OPENSSL_CTX
Various core and property related code files used global data. We should
store all of that in an OPENSSL_CTX instead.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8857)
Diffstat (limited to 'test/property_test.c')
-rw-r--r-- | test/property_test.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/test/property_test.c b/test/property_test.c index ee942526d8..7ec40d6e51 100644 --- a/test/property_test.c +++ b/test/property_test.c @@ -21,7 +21,7 @@ static int add_property_names(const char *n, ...) va_start(args, n); do { - if (!TEST_int_ne(ossl_property_name(n, 1), 0)) + if (!TEST_int_ne(ossl_property_name(NULL, n, 1), 0)) res = 0; } while ((n = va_arg(args, const char *)) != NULL); va_end(args); @@ -34,24 +34,24 @@ static int test_property_string(void) int res = 0; OSSL_PROPERTY_IDX i, j; - if (TEST_ptr(store = ossl_method_store_new()) - && TEST_int_eq(ossl_property_name("fnord", 0), 0) - && TEST_int_ne(ossl_property_name("fnord", 1), 0) - && TEST_int_ne(ossl_property_name("name", 1), 0) + if (TEST_ptr(store = ossl_method_store_new(NULL)) + && TEST_int_eq(ossl_property_name(NULL, "fnord", 0), 0) + && TEST_int_ne(ossl_property_name(NULL, "fnord", 1), 0) + && TEST_int_ne(ossl_property_name(NULL, "name", 1), 0) /* Property value checks */ - && TEST_int_eq(ossl_property_value("fnord", 0), 0) - && TEST_int_ne(i = ossl_property_value("no", 0), 0) - && TEST_int_ne(j = ossl_property_value("yes", 0), 0) + && TEST_int_eq(ossl_property_value(NULL, "fnord", 0), 0) + && TEST_int_ne(i = ossl_property_value(NULL, "no", 0), 0) + && TEST_int_ne(j = ossl_property_value(NULL, "yes", 0), 0) && TEST_int_ne(i, j) - && TEST_int_eq(ossl_property_value("yes", 1), j) - && TEST_int_eq(ossl_property_value("no", 1), i) - && TEST_int_ne(i = ossl_property_value("illuminati", 1), 0) - && TEST_int_eq(j = ossl_property_value("fnord", 1), i + 1) - && TEST_int_eq(ossl_property_value("fnord", 1), j) + && TEST_int_eq(ossl_property_value(NULL, "yes", 1), j) + && TEST_int_eq(ossl_property_value(NULL, "no", 1), i) + && TEST_int_ne(i = ossl_property_value(NULL, "illuminati", 1), 0) + && TEST_int_eq(j = ossl_property_value(NULL, "fnord", 1), i + 1) + && TEST_int_eq(ossl_property_value(NULL, "fnord", 1), j) /* Check name and values are distinct */ - && TEST_int_eq(ossl_property_value("cold", 0), 0) - && TEST_int_ne(ossl_property_name("fnord", 0), - ossl_property_value("fnord", 0))) + && TEST_int_eq(ossl_property_value(NULL, "cold", 0), 0) + && TEST_int_ne(ossl_property_name(NULL, "fnord", 0), + ossl_property_value(NULL, "fnord", 0))) res = 1; ossl_method_store_free(store); return res; @@ -95,11 +95,11 @@ static int test_property_parse(int n) OSSL_PROPERTY_LIST *p = NULL, *q = NULL; int r = 0; - if (TEST_ptr(store = ossl_method_store_new()) + if (TEST_ptr(store = ossl_method_store_new(NULL)) && add_property_names("sky", "groan", "cold", "today", "tomorrow", "n", NULL) - && TEST_ptr(p = ossl_parse_property(parser_tests[n].defn)) - && TEST_ptr(q = ossl_parse_query(parser_tests[n].query)) + && TEST_ptr(p = ossl_parse_property(NULL, parser_tests[n].defn)) + && TEST_ptr(q = ossl_parse_query(NULL, parser_tests[n].query)) && TEST_int_eq(ossl_property_match(q, p), parser_tests[n].e)) r = 1; ossl_property_free(p); @@ -141,12 +141,12 @@ static int test_property_merge(int n) OSSL_PROPERTY_LIST *q_combined = NULL, *prop = NULL; int r = 0; - if (TEST_ptr(store = ossl_method_store_new()) + if (TEST_ptr(store = ossl_method_store_new(NULL)) && add_property_names("colour", "urn", "clouds", "pot", "day", "night", NULL) - && TEST_ptr(prop = ossl_parse_property(merge_tests[n].prop)) - && TEST_ptr(q_global = ossl_parse_query(merge_tests[n].q_global)) - && TEST_ptr(q_local = ossl_parse_query(merge_tests[n].q_local)) + && TEST_ptr(prop = ossl_parse_property(NULL, merge_tests[n].prop)) + && TEST_ptr(q_global = ossl_parse_query(NULL, merge_tests[n].q_global)) + && TEST_ptr(q_local = ossl_parse_query(NULL, merge_tests[n].q_local)) && TEST_ptr(q_combined = ossl_property_merge(q_local, q_global)) && TEST_true(ossl_property_match(q_combined, prop))) r = 1; @@ -164,15 +164,15 @@ static int test_property_defn_cache(void) OSSL_PROPERTY_LIST *red, *blue; int r = 0; - if (TEST_ptr(store = ossl_method_store_new()) + if (TEST_ptr(store = ossl_method_store_new(NULL)) && add_property_names("red", "blue", NULL) - && TEST_ptr(red = ossl_parse_property("red")) - && TEST_ptr(blue = ossl_parse_property("blue")) + && TEST_ptr(red = ossl_parse_property(NULL, "red")) + && TEST_ptr(blue = ossl_parse_property(NULL, "blue")) && TEST_ptr_ne(red, blue) - && TEST_true(ossl_prop_defn_set("red", red)) - && TEST_true(ossl_prop_defn_set("blue", blue)) - && TEST_ptr_eq(ossl_prop_defn_get("red"), red) - && TEST_ptr_eq(ossl_prop_defn_get("blue"), blue)) + && TEST_true(ossl_prop_defn_set(NULL, "red", red)) + && TEST_true(ossl_prop_defn_set(NULL, "blue", blue)) + && TEST_ptr_eq(ossl_prop_defn_get(NULL, "red"), red) + && TEST_ptr_eq(ossl_prop_defn_get(NULL, "blue"), blue)) r = 1; ossl_method_store_free(store); return r; @@ -196,10 +196,10 @@ static int test_definition_compares(int n) OSSL_PROPERTY_LIST *d = NULL, *q = NULL; int r; - r = TEST_ptr(store = ossl_method_store_new()) + r = TEST_ptr(store = ossl_method_store_new(NULL)) && add_property_names("alpha", "omega", NULL) - && TEST_ptr(d = ossl_parse_property(definition_tests[n].defn)) - && TEST_ptr(q = ossl_parse_query(definition_tests[n].query)) + && TEST_ptr(d = ossl_parse_property(NULL, definition_tests[n].defn)) + && TEST_ptr(q = ossl_parse_query(NULL, definition_tests[n].query)) && TEST_int_eq(ossl_property_match(q, d), definition_tests[n].e); ossl_property_free(d); @@ -224,7 +224,7 @@ static int test_register_deregister(void) int ret = 0; OSSL_METHOD_STORE *store; - if (!TEST_ptr(store = ossl_method_store_new()) + if (!TEST_ptr(store = ossl_method_store_new(NULL)) || !add_property_names("position", NULL)) goto err; @@ -291,7 +291,7 @@ static int test_property(void) int ret = 0; void *result; - if (!TEST_ptr(store = ossl_method_store_new()) + if (!TEST_ptr(store = ossl_method_store_new(NULL)) || !add_property_names("fast", "colour", "sky", "furry", NULL)) goto err; @@ -329,7 +329,7 @@ static int test_query_cache_stochastic(void) int errors = 0; int v[10001]; - if (!TEST_ptr(store = ossl_method_store_new()) + if (!TEST_ptr(store = ossl_method_store_new(NULL)) || !add_property_names("n", NULL)) goto err; |