Commit 629192c1 authored by Rich Salz's avatar Rich Salz
Browse files

Exdata test was never enabled. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2787)
parent d5aa14dd

test/build.info

+5 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
IF[{- !$disabled{tests} -}]

  PROGRAMS_NO_INST=\

          aborttest \

          sanitytest bntest \

          sanitytest exdatatest bntest \

          ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \

          md2test \

          hmactest \
@@ -38,6 +38,10 @@ IF[{- !$disabled{tests} -}] 
  INCLUDE[sanitytest]=../include

  DEPEND[sanitytest]=../libcrypto



  SOURCE[exdatatest]=exdatatest.c

  INCLUDE[exdatatest]=../include

  DEPEND[exdatatest]=../libcrypto



  SOURCE[bntest]=bntest.c testutil.c test_main_custom.c

  INCLUDE[bntest]=.. ../crypto/include ../include

  DEPEND[bntest]=../libcrypto

test/exdatatest.c

+31 −28
Original line number Diff line number Diff line 
/*

 * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -8,68 +8,66 @@ 
 */



#include <stdio.h>

#include <assert.h>

#include <string.h>

#include <stdlib.h>

#include <assert.h>

#include <openssl/crypto.h>



static long sargl;

static void *sargp;

static int sidx;

static long saved_argl;

static void *saved_argp;

static int saved_idx;



static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,

          int idx, long argl, void *argp)

{

    assert(idx == sidx);

    assert(argl == sargl);

    assert(argp == sargp);

    assert(idx == saved_idx);

    assert(argl == saved_argl);

    assert(argp == saved_argp);

}



static int exdup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,

static int exdup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,

          void *from_d, int idx, long argl, void *argp)

{

    assert(idx == sidx);

    assert(argl == sargl);

    assert(argp == sargp);

    assert(idx == saved_idx);

    assert(argl == saved_argl);

    assert(argp == saved_argp);

    return 0;

}



static void exfree(void *parent, void *ptr, CRYPTO_EX_DATA *ad,

            int idx, long argl, void *argp)

{

    assert(idx == sidx);

    assert(argl == sargl);

    assert(argp == sargp);

    assert(idx == saved_idx);

    assert(argl == saved_argl);

    assert(argp == saved_argp);

}



typedef struct myobj_st {

    CRYPTO_EX_DATA ex_data;

    int id;

    int st;

} MYOBJ;



static MYOBJ *MYOBJ_new()

{

    static int count = 0;

    MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));

    int st;



    obj->id = ++count;

    st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);

    assert(st != 0);

    obj->st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);

    assert(obj->st != 0);

    return obj;

}



static void MYOBJ_sethello(MYOBJ *obj, char *cp)

{

    int st;



    st = CRYPTO_set_ex_data(&obj->ex_data, sidx, cp);

    assert(st != 0);

    obj->st = CRYPTO_set_ex_data(&obj->ex_data, saved_idx, cp);

    assert(obj->st != 0);

}



static char *MYOBJ_gethello(MYOBJ *obj)

{

    return CRYPTO_get_ex_data(&obj->ex_data, sidx);

    return CRYPTO_get_ex_data(&obj->ex_data, saved_idx);

}



static void MYOBJ_free(MYOBJ *obj)
@@ -85,20 +83,25 @@ int main() 
    char *p;



    p = strdup("hello world");

    sargl = 21;

    sargp = malloc(1);

    sidx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP, sargl, sargp,

    saved_argl = 21;

    saved_argp = malloc(1);

    saved_idx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,

                                        saved_argl, saved_argp,

                                        exnew, exdup, exfree);

    t1 = MYOBJ_new();

    t2 = MYOBJ_new();

    MYOBJ_sethello(t1, p);

    cp = MYOBJ_gethello(t1);

    assert(cp == p);

    if (cp != p)

        return 1;

    cp = MYOBJ_gethello(t2);

    assert(cp == NULL);

    if (cp != NULL)

        return 1;

    MYOBJ_free(t1);

    MYOBJ_free(t2);

    free(sargp);

    free(saved_argp);

    free(p);

    return 0;

}

test/recipes/03-test_exdata.t

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#! /usr/bin/env perl

# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.

#

# Licensed under the OpenSSL license (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





use OpenSSL::Test::Simple;



simple_test("test_exdata", "exdatatest");