generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix dh_pub_encode

Browse Source 
The return value from ASN1_STRING_new() was not being checked which could
lead to a NULL deref in the event of a malloc failure. Also fixed a mem
leak in the error path.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 6aa8dab2bbfd5ad3cfc0d07fe5d7243635d5b2a2)

Conflicts:
	crypto/dh/dh_ameth.c
This commit is contained in:
Matt Caswell 2015-03-11 20:08:16 +00:00
parent 2679485e69
commit 3942e7d9eb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/dh/dh_ameth.c
View File

@ -126,7 +126,6 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
{ {
DH *dh; DH *dh;
void *pval = NULL;
int ptype; int ptype;
unsigned char *penc = NULL; unsigned char *penc = NULL;
int penclen; int penclen;
@ -136,12 +135,15 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
dh = pkey->pkey.dh; dh = pkey->pkey.dh;
str = ASN1_STRING_new(); str = ASN1_STRING_new();
if(!str) {
DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
goto err;
}
str->length = i2d_DHparams(dh, &str->data); str->length = i2d_DHparams(dh, &str->data);
if (str->length <= 0) { if (str->length <= 0) {
DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
goto err; goto err;
} }
pval = str;
ptype = V_ASN1_SEQUENCE; ptype = V_ASN1_SEQUENCE;
pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL); pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
@ -158,14 +160,14 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
} }
if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DH), if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DH),
ptype, pval, penc, penclen)) ptype, str, penc, penclen))
return 1; return 1;
err: err:
if (penc) if (penc)
OPENSSL_free(penc); OPENSSL_free(penc);
if (pval) if (str)
ASN1_STRING_free(pval); ASN1_STRING_free(str);
return 0; return 0;
} }