/*
- * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2021 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
static void *saved_argp;
static int saved_idx;
static int saved_idx2;
+static int saved_idx3;
static int gbl_result;
/*
}
static int exdup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
- void *from_d, int idx, long argl, void *argp)
+ void **from_d, int idx, long argl, void *argp)
{
if (!TEST_int_eq(idx, saved_idx)
|| !TEST_long_eq(argl, saved_argl)
int idx, long argl, void *argp)
{
MYOBJ_EX_DATA *ex_data = OPENSSL_zalloc(sizeof(*ex_data));
- if (!TEST_int_eq(idx, saved_idx2)
+
+ if (!TEST_true(idx == saved_idx2 || idx == saved_idx3)
|| !TEST_long_eq(argl, saved_argl)
|| !TEST_ptr_eq(argp, saved_argp)
|| !TEST_ptr_null(ptr)
|| !TEST_ptr(ex_data)
- || !TEST_true(CRYPTO_set_ex_data(ad, saved_idx2, ex_data))) {
+ || !TEST_true(CRYPTO_set_ex_data(ad, idx, ex_data))) {
gbl_result = 0;
OPENSSL_free(ex_data);
} else {
}
static int exdup2(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
- void *from_d, int idx, long argl, void *argp)
+ void **from_d, int idx, long argl, void *argp)
{
MYOBJ_EX_DATA **update_ex_data = (MYOBJ_EX_DATA**)from_d;
- MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(to, saved_idx2);
- if (!TEST_int_eq(idx, saved_idx2)
+ MYOBJ_EX_DATA *ex_data = NULL;
+
+ if (!TEST_true(idx == saved_idx2 || idx == saved_idx3)
|| !TEST_long_eq(argl, saved_argl)
|| !TEST_ptr_eq(argp, saved_argp)
|| !TEST_ptr(from_d)
|| !TEST_ptr(*update_ex_data)
- || !TEST_ptr(ex_data)
+ || !TEST_ptr(ex_data = CRYPTO_get_ex_data(to, idx))
|| !TEST_true(ex_data->new)) {
gbl_result = 0;
} else {
static void exfree2(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
int idx, long argl, void *argp)
{
- MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(ad, saved_idx2);
- OPENSSL_free(ex_data);
- if (!TEST_int_eq(idx, saved_idx2)
+ MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(ad, idx);
+
+ if (!TEST_true(idx == saved_idx2 || idx == saved_idx3)
|| !TEST_long_eq(argl, saved_argl)
|| !TEST_ptr_eq(argp, saved_argp)
- || !TEST_ptr(ex_data)
- || !TEST_true(CRYPTO_set_ex_data(ad, saved_idx2, NULL)))
+ || !TEST_true(CRYPTO_set_ex_data(ad, idx, NULL)))
gbl_result = 0;
+ OPENSSL_free(ex_data);
}
typedef struct myobj_st {
static int count = 0;
MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));
- obj->id = ++count;
- obj->st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
+ if (obj != NULL) {
+ obj->id = ++count;
+ obj->st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
+ }
return obj;
}
static void MYOBJ_sethello2(MYOBJ *obj, char *cp)
{
MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
+
if (TEST_ptr(ex_data))
ex_data->hello = cp;
else
static char *MYOBJ_gethello2(MYOBJ *obj)
{
MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
+
+ if (TEST_ptr(ex_data))
+ return ex_data->hello;
+
+ obj->st = gbl_result = 0;
+ return NULL;
+}
+
+static void MYOBJ_allochello3(MYOBJ *obj, char *cp)
+{
+ MYOBJ_EX_DATA* ex_data = NULL;
+
+ if (TEST_ptr_null(ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3))
+ && TEST_true(CRYPTO_alloc_ex_data(CRYPTO_EX_INDEX_APP, obj,
+ &obj->ex_data, saved_idx3))
+ && TEST_ptr(ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3)))
+ ex_data->hello = cp;
+ else
+ obj->st = gbl_result = 0;
+}
+
+static char *MYOBJ_gethello3(MYOBJ *obj)
+{
+ MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3);
+
if (TEST_ptr(ex_data))
return ex_data->hello;
static void MYOBJ_free(MYOBJ *obj)
{
- CRYPTO_free_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
- OPENSSL_free(obj);
+ if (obj != NULL) {
+ CRYPTO_free_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
+ OPENSSL_free(obj);
+ }
}
static MYOBJ *MYOBJ_dup(MYOBJ *in)
{
MYOBJ *obj = MYOBJ_new();
- obj->st |= CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_APP, &obj->ex_data,
- &in->ex_data);
+ if (obj != NULL)
+ obj->st |= CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_APP, &obj->ex_data,
+ &in->ex_data);
return obj;
}
static int test_exdata(void)
{
- MYOBJ *t1, *t2, *t3;
- MYOBJ_EX_DATA *ex_data;
+ MYOBJ *t1 = NULL, *t2 = NULL, *t3 = NULL;
+ MYOBJ_EX_DATA *ex_data = NULL;
const char *cp;
char *p;
+ int res = 0;
gbl_result = 1;
- p = OPENSSL_strdup("hello world");
+ if (!TEST_ptr(p = OPENSSL_strdup("hello world")))
+ return 0;
saved_argl = 21;
- saved_argp = OPENSSL_malloc(1);
+ if (!TEST_ptr(saved_argp = OPENSSL_malloc(1)))
+ goto err;
saved_idx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,
saved_argl, saved_argp,
exnew, exdup, exfree);
t1 = MYOBJ_new();
t2 = MYOBJ_new();
if (!TEST_int_eq(t1->st, 1) || !TEST_int_eq(t2->st, 1))
- return 0;
+ goto err;
if (!TEST_ptr(CRYPTO_get_ex_data(&t1->ex_data, saved_idx2)))
- return 0;
- if (!TEST_ptr(CRYPTO_get_ex_data(&t2->ex_data, saved_idx2)))
- return 0;
+ goto err;
+
+ /*
+ * saved_idx3 differs from other indexes by being created after the exdata
+ * was initialized.
+ */
+ saved_idx3 = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,
+ saved_argl, saved_argp,
+ exnew2, exdup2, exfree2);
+ if (!TEST_ptr_null(CRYPTO_get_ex_data(&t1->ex_data, saved_idx3)))
+ goto err;
MYOBJ_sethello(t1, p);
cp = MYOBJ_gethello(t1);
if (!TEST_ptr_eq(cp, p))
- return 0;
+ goto err;
MYOBJ_sethello2(t1, p);
cp = MYOBJ_gethello2(t1);
if (!TEST_ptr_eq(cp, p))
- return 0;
+ goto err;
+
+ MYOBJ_allochello3(t1, p);
+ cp = MYOBJ_gethello3(t1);
+ if (!TEST_ptr_eq(cp, p))
+ goto err;
cp = MYOBJ_gethello(t2);
if (!TEST_ptr_null(cp))
- return 0;
+ goto err;
cp = MYOBJ_gethello2(t2);
if (!TEST_ptr_null(cp))
- return 0;
+ goto err;
t3 = MYOBJ_dup(t1);
if (!TEST_int_eq(t3->st, 1))
- return 0;
+ goto err;
ex_data = CRYPTO_get_ex_data(&t3->ex_data, saved_idx2);
if (!TEST_ptr(ex_data))
- return 0;
+ goto err;
if (!TEST_int_eq(ex_data->dup, 1))
- return 0;
+ goto err;
cp = MYOBJ_gethello(t3);
if (!TEST_ptr_eq(cp, p))
- return 0;
+ goto err;
cp = MYOBJ_gethello2(t3);
if (!TEST_ptr_eq(cp, p))
- return 0;
+ goto err;
+ cp = MYOBJ_gethello3(t3);
+ if (!TEST_ptr_eq(cp, p))
+ goto err;
+
+ if (gbl_result)
+ res = 1;
+ err:
MYOBJ_free(t1);
MYOBJ_free(t2);
MYOBJ_free(t3);
OPENSSL_free(saved_argp);
+ saved_argp = NULL;
OPENSSL_free(p);
-
- if (gbl_result)
- return 1;
- else
- return 0;
+ return res;
}
int setup_tests(void)
projects / thirdparty / openssl.git / blobdiff