diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2018-12-25 16:34:24 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2018-12-25 16:34:24 +0300 |
| commit | 3ae260799030954cd98730e4ff613af6b4ef6ae0 (patch) | |
| tree | 49f168297a7570a651541218349fe48b97e805af /gost_ec_keyx.c | |
| parent | 21fa9570fc442044273d2aff3b7677495b75907e (diff) | |
| download | gost-engine-3ae260799030954cd98730e4ff613af6b4ef6ae0.zip gost-engine-3ae260799030954cd98730e4ff613af6b4ef6ae0.tar.gz gost-engine-3ae260799030954cd98730e4ff613af6b4ef6ae0.tar.bz2 | |
Avoid double-free, restore ephemeral mode self-compatibility
Diffstat (limited to 'gost_ec_keyx.c')
| -rw-r--r-- | gost_ec_keyx.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gost_ec_keyx.c b/gost_ec_keyx.c index 6313a6b..a95df33 100644 --- a/gost_ec_keyx.c +++ b/gost_ec_keyx.c @@ -391,6 +391,12 @@ static int pkey_gost2018_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out, sec_key = EVP_PKEY_CTX_get0_peerkey(pctx); if (!sec_key) { + sec_key = EVP_PKEY_new(); + if (sec_key == NULL) { + GOSTerr(GOST_F_PKEY_GOST2018_ENCRYPT, ERR_R_MALLOC_FAILURE ); + goto err; + } + if (!EVP_PKEY_assign(sec_key, EVP_PKEY_base_id(pubk), EC_KEY_new()) || !EVP_PKEY_copy_parameters(sec_key, pubk) || !gost_ec_keygen(EVP_PKEY_get0(sec_key))) { @@ -432,13 +438,12 @@ static int pkey_gost2018_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out, goto err; } - EVP_PKEY_free(sec_key); - if ((*out_len = i2d_PSKeyTransport_gost(pst, out ? &out : NULL)) > 0) ret = 1; err: if (key_is_ephemeral) EVP_PKEY_free(sec_key); + PSKeyTransport_gost_free(pst); OPENSSL_free(exp_buf); return ret; |