diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-13 00:18:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-12-16 14:17:53 +0000 |
| commit | 44d4f8f2d761d919fd6267cce112dad36590879f (patch) | |
| tree | 595ba1302c223af17c2cb439e34472a1fdfaaba7 /ssl/statem | |
| parent | 2c61a5eccad5085cab916c0959cb4c2fec16f9e5 (diff) | |
remove unnecessary key copy
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/statem')
| -rw-r--r-- | ssl/statem/statem_srvr.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index a8c765c851..ac5125c756 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -2129,7 +2129,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) DH *dh_srvr, *dh_clnt = NULL; #endif #ifndef OPENSSL_NO_EC - EC_KEY *srvr_ecdh = NULL; EC_POINT *clnt_ecpoint = NULL; #endif PACKET enc_premaster; @@ -2460,15 +2459,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) int field_size = 0; const EC_KEY *tkey; const EC_GROUP *group; - const BIGNUM *priv_key; unsigned char *shared; - /* initialize structures for server's ECDH key pair */ - if ((srvr_ecdh = EC_KEY_new()) == NULL) { - SSLerr(SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE); - goto err; - } - /* Let's get server private key and group information */ if (alg_k & (SSL_kECDHr | SSL_kECDHe)) { /* use the certificate */ @@ -2482,13 +2474,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) } group = EC_KEY_get0_group(tkey); - priv_key = EC_KEY_get0_private_key(tkey); - - if (!EC_KEY_set_group(srvr_ecdh, group) || - !EC_KEY_set_private_key(srvr_ecdh, priv_key)) { - SSLerr(SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE, ERR_R_EC_LIB); - goto err; - } /* Let's get client's public key */ if ((clnt_ecpoint = EC_POINT_new(group)) == NULL) { @@ -2538,7 +2523,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) goto err; } i = ECDH_compute_key(shared, (field_size + 7) / 8, clnt_ecpoint, - srvr_ecdh, NULL); + tkey, NULL); if (i <= 0) { SSLerr(SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE, ERR_R_ECDH_LIB); OPENSSL_free(shared); @@ -2546,7 +2531,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) } EC_POINT_free(clnt_ecpoint); - EC_KEY_free(srvr_ecdh); EC_KEY_free(s->s3->tmp.ecdh); s->s3->tmp.ecdh = NULL; @@ -2700,7 +2684,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) #endif #ifndef OPENSSL_NO_EC EC_POINT_free(clnt_ecpoint); - EC_KEY_free(srvr_ecdh); OPENSSL_free(rsa_decrypt); #endif #ifndef OPENSSL_NO_PSK |