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

Fix ossl_param_bld_push_{utf8,octet}_string() / param_bld_convert()

Browse source 
ossl_param_bld_push_{utf8,octet}_string() saved the constant string
pointer to a non-constant structure field, so we change that field to
a pointer to a constant.  We also modify param_bld_convert() to
pretend the resulting pointer for PTR types points to a constant as
well.

Completes #9649

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9651)
This commit is contained in:
Richard Levitte 2019-08-21 11:08:20 +02:00
parent 5fa7789f1b
commit d32d304836
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crypto/param_build.c
View file

@ -260,7 +260,7 @@ static OSSL_PARAM *param_bld_convert(OSSL_PARAM_BLD *bld, OSSL_PARAM *param,
} else if (pd->type == OSSL_PARAM_OCTET_PTR
|| pd->type == OSSL_PARAM_UTF8_PTR) {
/* PTR */
*(void **)p = pd->string;
*(const void **)p = pd->string;
} else if (pd->type == OSSL_PARAM_OCTET_STRING
|| pd->type == OSSL_PARAM_UTF8_STRING) {
if (pd->string != NULL)

2
include/internal/param_build.h
View file

@ -20,7 +20,7 @@ typedef struct {
size_t size;
size_t alloc_blocks;
const BIGNUM *bn;
void *string;
const void *string;
union {
/*
* These fields are never directly addressed, but their sizes are