wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaner disposal of ephemeral engine ids and names

Browse source 
Engine names and ids are typically static strings.  If an application
actually dynamically allocated these, the application owns the
storage, and should dispose of it via the original handle, rather
than the "const char *" returned by the engine.

In any case, this resolves the test code issue without resort to
"unconst" macros/casts.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Viktor Dukhovni 2018-12-09 18:37:56 -05:00
parent 9b34028187
commit 1057c2c39f
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/enginetest.c
View file

@ -44,8 +44,9 @@ static void display_engine_list(void)
static int test_engines(void) static int test_engines(void)
{ {
ENGINE *block[NUMTOADD]; ENGINE *block[NUMTOADD];
char *eid[NUMTOADD];
char *ename[NUMTOADD];
char buf[256]; char buf[256];
const char *id, *name;
ENGINE *ptr; ENGINE *ptr;
int loop; int loop;
int to_return = 0; int to_return = 0;
@ -138,12 +139,12 @@ static int test_engines(void)
TEST_info("About to beef up the engine-type list"); TEST_info("About to beef up the engine-type list");
for (loop = 0; loop < NUMTOADD; loop++) { for (loop = 0; loop < NUMTOADD; loop++) {
sprintf(buf, "id%d", loop); sprintf(buf, "id%d", loop);
id = OPENSSL_strdup(buf); eid[loop] = OPENSSL_strdup(buf);
sprintf(buf, "Fake engine type %d", loop); sprintf(buf, "Fake engine type %d", loop);
name = OPENSSL_strdup(buf); ename[loop] = OPENSSL_strdup(buf);
if (!TEST_ptr(block[loop] = ENGINE_new()) if (!TEST_ptr(block[loop] = ENGINE_new())
|| !TEST_true(ENGINE_set_id(block[loop], id)) || !TEST_true(ENGINE_set_id(block[loop], eid[loop]))
|| !TEST_true(ENGINE_set_name(block[loop], name))) || !TEST_true(ENGINE_set_name(block[loop], ename[loop])))
goto end; goto end;
} }
for (loop = 0; loop < NUMTOADD; loop++) { for (loop = 0; loop < NUMTOADD; loop++) {
@ -162,8 +163,8 @@ static int test_engines(void)
ENGINE_free(ptr); ENGINE_free(ptr);
} }
for (loop = 0; loop < NUMTOADD; loop++) { for (loop = 0; loop < NUMTOADD; loop++) {
OPENSSL_free((void *)(intptr_t)ENGINE_get_id(block[loop])); OPENSSL_free(eid[loop]);
OPENSSL_free((void *)(intptr_t)ENGINE_get_name(block[loop])); OPENSSL_free(ename[loop]);
} }
to_return = 1; to_return = 1;

4
test/hmactest.c
View file

@ -38,7 +38,7 @@ static struct test_st {
"e9139d1e6ee064ef8cf514fc7dc83e86", "e9139d1e6ee064ef8cf514fc7dc83e86",
}, },
{ {
"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
16, "Hi There", 8, 16, "Hi There", 8,
"9294727a3638bb1c13f48ef8158bfc9d", "9294727a3638bb1c13f48ef8158bfc9d",
}, },
@ -47,7 +47,7 @@ static struct test_st {
"750c783e6ab0b503eaa86e310a5db738", "750c783e6ab0b503eaa86e310a5db738",
}, },
{ {
"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
16, { 16, {
0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,