mirror of
https://github.com/openssl/openssl.git
synced 2025-02-23 14:42:15 +08:00
Exdata test was never enabled.
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2787)
This commit is contained in:
parent
d5aa14dde5
commit
629192c1b9
test
@ -12,7 +12,7 @@
|
|||||||
IF[{- !$disabled{tests} -}]
|
IF[{- !$disabled{tests} -}]
|
||||||
PROGRAMS_NO_INST=\
|
PROGRAMS_NO_INST=\
|
||||||
aborttest \
|
aborttest \
|
||||||
sanitytest bntest \
|
sanitytest exdatatest bntest \
|
||||||
ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
|
ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
|
||||||
md2test \
|
md2test \
|
||||||
hmactest \
|
hmactest \
|
||||||
@ -38,6 +38,10 @@ IF[{- !$disabled{tests} -}]
|
|||||||
INCLUDE[sanitytest]=../include
|
INCLUDE[sanitytest]=../include
|
||||||
DEPEND[sanitytest]=../libcrypto
|
DEPEND[sanitytest]=../libcrypto
|
||||||
|
|
||||||
|
SOURCE[exdatatest]=exdatatest.c
|
||||||
|
INCLUDE[exdatatest]=../include
|
||||||
|
DEPEND[exdatatest]=../libcrypto
|
||||||
|
|
||||||
SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
|
SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
|
||||||
INCLUDE[bntest]=.. ../crypto/include ../include
|
INCLUDE[bntest]=.. ../crypto/include ../include
|
||||||
DEPEND[bntest]=../libcrypto
|
DEPEND[bntest]=../libcrypto
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* 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
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@ -8,68 +8,66 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <assert.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <assert.h>
|
||||||
#include <openssl/crypto.h>
|
#include <openssl/crypto.h>
|
||||||
|
|
||||||
static long sargl;
|
static long saved_argl;
|
||||||
static void *sargp;
|
static void *saved_argp;
|
||||||
static int sidx;
|
static int saved_idx;
|
||||||
|
|
||||||
static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
|
static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
|
||||||
int idx, long argl, void *argp)
|
int idx, long argl, void *argp)
|
||||||
{
|
{
|
||||||
assert(idx == sidx);
|
assert(idx == saved_idx);
|
||||||
assert(argl == sargl);
|
assert(argl == saved_argl);
|
||||||
assert(argp == sargp);
|
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)
|
void *from_d, int idx, long argl, void *argp)
|
||||||
{
|
{
|
||||||
assert(idx == sidx);
|
assert(idx == saved_idx);
|
||||||
assert(argl == sargl);
|
assert(argl == saved_argl);
|
||||||
assert(argp == sargp);
|
assert(argp == saved_argp);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void exfree(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
|
static void exfree(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
|
||||||
int idx, long argl, void *argp)
|
int idx, long argl, void *argp)
|
||||||
{
|
{
|
||||||
assert(idx == sidx);
|
assert(idx == saved_idx);
|
||||||
assert(argl == sargl);
|
assert(argl == saved_argl);
|
||||||
assert(argp == sargp);
|
assert(argp == saved_argp);
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct myobj_st {
|
typedef struct myobj_st {
|
||||||
CRYPTO_EX_DATA ex_data;
|
CRYPTO_EX_DATA ex_data;
|
||||||
int id;
|
int id;
|
||||||
|
int st;
|
||||||
} MYOBJ;
|
} MYOBJ;
|
||||||
|
|
||||||
static MYOBJ *MYOBJ_new()
|
static MYOBJ *MYOBJ_new()
|
||||||
{
|
{
|
||||||
static int count = 0;
|
static int count = 0;
|
||||||
MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));
|
MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));
|
||||||
int st;
|
|
||||||
|
|
||||||
obj->id = ++count;
|
obj->id = ++count;
|
||||||
st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
|
obj->st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
|
||||||
assert(st != 0);
|
assert(obj->st != 0);
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void MYOBJ_sethello(MYOBJ *obj, char *cp)
|
static void MYOBJ_sethello(MYOBJ *obj, char *cp)
|
||||||
{
|
{
|
||||||
int st;
|
obj->st = CRYPTO_set_ex_data(&obj->ex_data, saved_idx, cp);
|
||||||
|
assert(obj->st != 0);
|
||||||
st = CRYPTO_set_ex_data(&obj->ex_data, sidx, cp);
|
|
||||||
assert(st != 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *MYOBJ_gethello(MYOBJ *obj)
|
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)
|
static void MYOBJ_free(MYOBJ *obj)
|
||||||
@ -85,20 +83,25 @@ int main()
|
|||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
p = strdup("hello world");
|
p = strdup("hello world");
|
||||||
sargl = 21;
|
saved_argl = 21;
|
||||||
sargp = malloc(1);
|
saved_argp = malloc(1);
|
||||||
sidx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP, sargl, sargp,
|
saved_idx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,
|
||||||
exnew, exdup, exfree);
|
saved_argl, saved_argp,
|
||||||
|
exnew, exdup, exfree);
|
||||||
t1 = MYOBJ_new();
|
t1 = MYOBJ_new();
|
||||||
t2 = MYOBJ_new();
|
t2 = MYOBJ_new();
|
||||||
MYOBJ_sethello(t1, p);
|
MYOBJ_sethello(t1, p);
|
||||||
cp = MYOBJ_gethello(t1);
|
cp = MYOBJ_gethello(t1);
|
||||||
assert(cp == p);
|
assert(cp == p);
|
||||||
|
if (cp != p)
|
||||||
|
return 1;
|
||||||
cp = MYOBJ_gethello(t2);
|
cp = MYOBJ_gethello(t2);
|
||||||
assert(cp == NULL);
|
assert(cp == NULL);
|
||||||
|
if (cp != NULL)
|
||||||
|
return 1;
|
||||||
MYOBJ_free(t1);
|
MYOBJ_free(t1);
|
||||||
MYOBJ_free(t2);
|
MYOBJ_free(t2);
|
||||||
free(sargp);
|
free(saved_argp);
|
||||||
free(p);
|
free(p);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
12
test/recipes/03-test_exdata.t
Normal file
12
test/recipes/03-test_exdata.t
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#! /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");
|
Loading…
Reference in New Issue
Block a user