OpenSSL 1.1.1-pre2

test/exdatatest.c

@@ -12,10 +12,13 @@
 #include <stdlib.h>
 #include <openssl/crypto.h>
 
+#include "testutil.h"
+
 static long saved_argl;
 static void *saved_argp;
 static int saved_idx;
 static int saved_idx2;
+static int gbl_result;
 
 /*
  * SIMPLE EX_DATA IMPLEMENTATION
@@ -25,28 +28,31 @@ static int saved_idx2;
 static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
           int idx, long argl, void *argp)
 {
-    OPENSSL_assert(idx == saved_idx);
-    OPENSSL_assert(argl == saved_argl);
-    OPENSSL_assert(argp == saved_argp);
-    OPENSSL_assert(ptr == NULL);
+    if (!TEST_int_eq(idx, saved_idx)
+        || !TEST_long_eq(argl, saved_argl)
+        || !TEST_ptr_eq(argp, saved_argp)
+        || !TEST_ptr_null(ptr))
+        gbl_result = 0;
 }
 
 static int exdup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
           void *from_d, int idx, long argl, void *argp)
 {
-    OPENSSL_assert(idx == saved_idx);
-    OPENSSL_assert(argl == saved_argl);
-    OPENSSL_assert(argp == saved_argp);
-    OPENSSL_assert(from_d != NULL);
+    if (!TEST_int_eq(idx, saved_idx)
+        || !TEST_long_eq(argl, saved_argl)
+        || !TEST_ptr_eq(argp, saved_argp)
+        || !TEST_ptr(from_d))
+        gbl_result = 0;
     return 1;
 }
 
 static void exfree(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
             int idx, long argl, void *argp)
 {
-    OPENSSL_assert(idx == saved_idx);
-    OPENSSL_assert(argl == saved_argl);
-    OPENSSL_assert(argp == saved_argp);
+    if (!TEST_int_eq(idx, saved_idx)
+        || !TEST_long_eq(argl, saved_argl)
+        || !TEST_ptr_eq(argp, saved_argp))
+        gbl_result = 0;
 }
 
 /*
@@ -64,20 +70,18 @@ typedef struct myobj_ex_data_st {
 static void exnew2(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
           int idx, long argl, void *argp)
 {
-    int ret;
-    MYOBJ_EX_DATA *ex_data;
-
-    OPENSSL_assert(idx == saved_idx2);
-    OPENSSL_assert(argl == saved_argl);
-    OPENSSL_assert(argp == saved_argp);
-    OPENSSL_assert(ptr == NULL);
-
-    ex_data = OPENSSL_zalloc(sizeof(*ex_data));
-    OPENSSL_assert(ex_data != NULL);
-    ret = CRYPTO_set_ex_data(ad, saved_idx2, ex_data);
-    OPENSSL_assert(ret);
-
-    ex_data->new = 1;
+    MYOBJ_EX_DATA *ex_data = OPENSSL_zalloc(sizeof(*ex_data));
+    if (!TEST_int_eq(idx, saved_idx2)
+        || !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))) {
+        gbl_result = 0;
+        OPENSSL_free(ex_data);
+    } else {
+        ex_data->new = 1;
+    }
 }
 
 static int exdup2(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
@@ -85,21 +89,22 @@ static int exdup2(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
 {
     MYOBJ_EX_DATA **update_ex_data = (MYOBJ_EX_DATA**)from_d;
     MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(to, saved_idx2);
-
-    OPENSSL_assert(idx == saved_idx2);
-    OPENSSL_assert(argl == saved_argl);
-    OPENSSL_assert(argp == saved_argp);
-    OPENSSL_assert(from_d != NULL);
-    OPENSSL_assert(*update_ex_data != NULL);
-    OPENSSL_assert(ex_data != NULL);
-    OPENSSL_assert(ex_data->new);
-
-    /* Copy hello over */
-    ex_data->hello = (*update_ex_data)->hello;
-    /* indicate this is a dup */
-    ex_data->dup = 1;
-    /* Keep my original ex_data */
-    *update_ex_data = ex_data;
+    if (!TEST_int_eq(idx, saved_idx2)
+        || !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_true(ex_data->new)) {
+        gbl_result = 0;
+    } else {
+        /* Copy hello over */
+        ex_data->hello = (*update_ex_data)->hello;
+        /* indicate this is a dup */
+        ex_data->dup = 1;
+        /* Keep my original ex_data */
+        *update_ex_data = ex_data;
+    }
     return 1;
 }
 
@@ -107,15 +112,13 @@ 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);
-    int ret;
-
-    OPENSSL_assert(ex_data != NULL);
     OPENSSL_free(ex_data);
-    OPENSSL_assert(idx == saved_idx2);
-    OPENSSL_assert(argl == saved_argl);
-    OPENSSL_assert(argp == saved_argp);
-    ret = CRYPTO_set_ex_data(ad, saved_idx2, NULL);
-    OPENSSL_assert(ret);
+    if (!TEST_int_eq(idx, saved_idx2)
+        || !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)))
+        gbl_result = 0;
 }
 
 typedef struct myobj_st {
@@ -131,14 +134,14 @@ static MYOBJ *MYOBJ_new()
 
     obj->id = ++count;
     obj->st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
-    OPENSSL_assert(obj->st != 0);
     return obj;
 }
 
 static void MYOBJ_sethello(MYOBJ *obj, char *cp)
 {
     obj->st = CRYPTO_set_ex_data(&obj->ex_data, saved_idx, cp);
-    OPENSSL_assert(obj->st != 0);
+    if (!TEST_int_eq(obj->st, 1))
+        gbl_result = 0;
 }
 
 static char *MYOBJ_gethello(MYOBJ *obj)
@@ -149,19 +152,19 @@ static char *MYOBJ_gethello(MYOBJ *obj)
 static void MYOBJ_sethello2(MYOBJ *obj, char *cp)
 {
     MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
-    if (ex_data != NULL)
+    if (TEST_ptr(ex_data))
         ex_data->hello = cp;
     else
-        obj->st = 0;
+        obj->st = gbl_result = 0;
 }
 
 static char *MYOBJ_gethello2(MYOBJ *obj)
 {
     MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
-    if (ex_data != NULL)
+    if (TEST_ptr(ex_data))
         return ex_data->hello;
 
-    obj->st = 0;
+    obj->st = gbl_result = 0;
     return NULL;
 }
 
@@ -175,19 +178,20 @@ static MYOBJ *MYOBJ_dup(MYOBJ *in)
 {
     MYOBJ *obj = MYOBJ_new();
 
-    obj->st = CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_APP, &obj->ex_data,
+    obj->st |= CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_APP, &obj->ex_data,
                                  &in->ex_data);
-    OPENSSL_assert(obj->st != 0);
     return obj;
 }
 
-int main()
+static int test_exdata(void)
 {
     MYOBJ *t1, *t2, *t3;
     MYOBJ_EX_DATA *ex_data;
     const char *cp;
     char *p;
 
+    gbl_result = 1;
+
     p = OPENSSL_strdup("hello world");
     saved_argl = 21;
     saved_argp = OPENSSL_malloc(1);
@@ -199,36 +203,63 @@ int main()
                                          exnew2, exdup2, exfree2);
     t1 = MYOBJ_new();
     t2 = MYOBJ_new();
-    OPENSSL_assert(t1->st && t2->st);
-    ex_data = CRYPTO_get_ex_data(&t1->ex_data, saved_idx2);
-    OPENSSL_assert(ex_data != NULL);
-    ex_data = CRYPTO_get_ex_data(&t2->ex_data, saved_idx2);
-    OPENSSL_assert(ex_data != NULL);
+    if (!TEST_int_eq(t1->st, 1) || !TEST_int_eq(t2->st, 1))
+        return 0;
+    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;
+
     MYOBJ_sethello(t1, p);
     cp = MYOBJ_gethello(t1);
-    OPENSSL_assert(cp == p);
-    cp = MYOBJ_gethello(t2);
-    OPENSSL_assert(cp == NULL);
+    if (!TEST_ptr_eq(cp, p))
+        return 0;
+
     MYOBJ_sethello2(t1, p);
     cp = MYOBJ_gethello2(t1);
-    OPENSSL_assert(cp == p);
-    OPENSSL_assert(t1->st);
+    if (!TEST_ptr_eq(cp, p))
+        return 0;
+
+    cp = MYOBJ_gethello(t2);
+    if (!TEST_ptr_null(cp))
+        return 0;
+
     cp = MYOBJ_gethello2(t2);
-    OPENSSL_assert(cp == NULL);
-    OPENSSL_assert(t2->st);
+    if (!TEST_ptr_null(cp))
+        return 0;
+
     t3 = MYOBJ_dup(t1);
+    if (!TEST_int_eq(t3->st, 1))
+        return 0;
+
     ex_data = CRYPTO_get_ex_data(&t3->ex_data, saved_idx2);
-    OPENSSL_assert(ex_data != NULL);
-    OPENSSL_assert(ex_data->dup);
+    if (!TEST_ptr(ex_data))
+        return 0;
+    if (!TEST_int_eq(ex_data->dup, 1))
+        return 0;
+
     cp = MYOBJ_gethello(t3);
-    OPENSSL_assert(cp == p);
+    if (!TEST_ptr_eq(cp, p))
+        return 0;
+
     cp = MYOBJ_gethello2(t3);
-    OPENSSL_assert(cp == p);
-    OPENSSL_assert(t3->st);
+    if (!TEST_ptr_eq(cp, p))
+        return 0;
+
     MYOBJ_free(t1);
     MYOBJ_free(t2);
     MYOBJ_free(t3);
     OPENSSL_free(saved_argp);
     OPENSSL_free(p);
-    return 0;
+
+    if (gbl_result)
+      return 1;
+    else
+      return 0;
+}
+
+int setup_tests(void)
+{
+    ADD_TEST(test_exdata);
+    return 1;
 }