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

EVP_PKEY DH client support.

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-12-17 01:07:46 +00:00
parent ffaef3f152
commit fb79abe378
3 changed files with 48 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ssl/s3_lib.c
View File

@@ -3377,11 +3377,13 @@ void ssl3_free(SSL *s)
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
DH_free(s->s3->tmp.dh); DH_free(s->s3->tmp.dh);
DH_free(s->s3->peer_dh_tmp);
#endif #endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
EVP_PKEY_free(s->s3->tmp.pkey); EVP_PKEY_free(s->s3->tmp.pkey);
s->s3->tmp.pkey = NULL; s->s3->tmp.pkey = NULL;
#endif
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY_free(s->s3->peer_tmp); EVP_PKEY_free(s->s3->peer_tmp);
s->s3->peer_tmp = NULL; s->s3->peer_tmp = NULL;
#endif #endif
@@ -3414,15 +3416,15 @@ void ssl3_clear(SSL *s)
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
DH_free(s->s3->tmp.dh); DH_free(s->s3->tmp.dh);
s->s3->tmp.dh = NULL; s->s3->tmp.dh = NULL;
DH_free(s->s3->peer_dh_tmp);
s->s3->peer_dh_tmp = NULL;
#endif #endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
EVP_PKEY_free(s->s3->tmp.pkey); EVP_PKEY_free(s->s3->tmp.pkey);
s->s3->tmp.pkey = NULL; s->s3->tmp.pkey = NULL;
s->s3->is_probably_safari = 0;
#endif
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY_free(s->s3->peer_tmp); EVP_PKEY_free(s->s3->peer_tmp);
s->s3->peer_tmp = NULL; s->s3->peer_tmp = NULL;
s->s3->is_probably_safari = 0;
#endif /* !OPENSSL_NO_EC */ #endif /* !OPENSSL_NO_EC */
ssl3_free_digest_list(s); ssl3_free_digest_list(s);
@@ -3759,34 +3761,17 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
return 0; return 0;
case SSL_CTRL_GET_SERVER_TMP_KEY: case SSL_CTRL_GET_SERVER_TMP_KEY:
if (s->server || !s->session) #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_EC)
return 0; if (s->server || s->session == NULL || s->s3->peer_tmp == NULL) {
else {
EVP_PKEY *ptmp;
int rv = 0;
#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_EC)
if (s->s3->peer_dh_tmp == NULL && s->s3->peer_tmp == NULL)
return 0;
#endif
ptmp = EVP_PKEY_new();
if (ptmp == NULL)
return 0;
#ifndef OPENSSL_NO_DH
else if (s->s3->peer_dh_tmp != NULL)
rv = EVP_PKEY_set1_DH(ptmp, s->s3->peer_dh_tmp);
#endif
#ifndef OPENSSL_NO_EC
else if (s->s3->peer_tmp != NULL)
rv = EVP_PKEY_set1_EC_KEY(ptmp,
EVP_PKEY_get0_EC_KEY(s->s3->peer_tmp));
#endif
if (rv) {
*(EVP_PKEY **)parg = ptmp;
return 1;
}
EVP_PKEY_free(ptmp);
return 0; return 0;
} else {
EVP_PKEY_up_ref(s->s3->peer_tmp);
*(EVP_PKEY **)parg = s->s3->peer_tmp;
return 1;
} }
#else
return 0;
#endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
case SSL_CTRL_GET_EC_POINT_FORMATS: case SSL_CTRL_GET_EC_POINT_FORMATS:
{ {

5
ssl/ssl_locl.h
View File

@@ -1327,10 +1327,7 @@ typedef struct ssl3_state_st {
# endif /* !OPENSSL_NO_EC */ # endif /* !OPENSSL_NO_EC */
/* For clients: peer temporary key */ /* For clients: peer temporary key */
# ifndef OPENSSL_NO_DH # if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
DH *peer_dh_tmp;
# endif
# ifndef OPENSSL_NO_EC
EVP_PKEY *peer_tmp; EVP_PKEY *peer_tmp;
# endif # endif

89
ssl/statem/statem_clnt.c
View File

@@ -1581,9 +1581,6 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
RSA *rsa = NULL; RSA *rsa = NULL;
#endif #endif
#ifndef OPENSSL_NO_DH
DH *dh = NULL;
#endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
EVP_PKEY_CTX *pctx = NULL; EVP_PKEY_CTX *pctx = NULL;
#endif #endif
@@ -1600,11 +1597,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
save_param_start = *pkt; save_param_start = *pkt;
#ifndef OPENSSL_NO_DH #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
DH_free(s->s3->peer_dh_tmp);
s->s3->peer_dh_tmp = NULL;
#endif
#ifndef OPENSSL_NO_EC
EVP_PKEY_free(s->s3->peer_tmp); EVP_PKEY_free(s->s3->peer_tmp);
s->s3->peer_tmp = NULL; s->s3->peer_tmp = NULL;
#endif #endif
@@ -1695,6 +1688,8 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
else if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) { else if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
PACKET prime, generator, pub_key; PACKET prime, generator, pub_key;
DH *dh;
if (!PACKET_get_length_prefixed_2(pkt, &prime) if (!PACKET_get_length_prefixed_2(pkt, &prime)
|| !PACKET_get_length_prefixed_2(pkt, &generator) || !PACKET_get_length_prefixed_2(pkt, &generator)
|| !PACKET_get_length_prefixed_2(pkt, &pub_key)) { || !PACKET_get_length_prefixed_2(pkt, &pub_key)) {
@@ -1702,8 +1697,18 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
goto f_err; goto f_err;
} }
if ((dh = DH_new()) == NULL) { s->s3->peer_tmp = EVP_PKEY_new();
SSLerr(SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_DH_LIB); dh = DH_new();
if (s->s3->peer_tmp == NULL || dh == NULL) {
SSLerr(SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
DH_free(dh);
goto err;
}
if (EVP_PKEY_assign_DH(s->s3->peer_tmp, dh) == 0) {
SSLerr(SSL_F_TLS_PROCESS_KEY_EXCHANGE, ERR_R_EVP_LIB);
DH_free(dh);
goto err; goto err;
} }
@@ -1731,9 +1736,6 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
if (alg_a & (SSL_aRSA|SSL_aDSS)) if (alg_a & (SSL_aRSA|SSL_aDSS))
pkey = X509_get_pubkey(s->session->peer); pkey = X509_get_pubkey(s->session->peer);
/* else anonymous DH, so no certificate or pkey. */ /* else anonymous DH, so no certificate or pkey. */
s->s3->peer_dh_tmp = dh;
dh = NULL;
} }
#endif /* !OPENSSL_NO_DH */ #endif /* !OPENSSL_NO_DH */
@@ -1915,9 +1917,6 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
RSA_free(rsa); RSA_free(rsa);
#endif #endif
#ifndef OPENSSL_NO_DH
DH_free(dh);
#endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
#endif #endif
@@ -2243,8 +2242,10 @@ int tls_construct_client_key_exchange(SSL *s)
unsigned char *q; unsigned char *q;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
#endif #endif
#ifndef OPENSSL_NO_EC #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY *ckey = NULL, *skey = NULL; EVP_PKEY *ckey = NULL, *skey = NULL;
#endif
#ifndef OPENSSL_NO_EC
unsigned char *encodedPoint = NULL; unsigned char *encodedPoint = NULL;
int encoded_pt_len = 0; int encoded_pt_len = 0;
#endif #endif
@@ -2391,52 +2392,30 @@ psk_err:
#endif #endif
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
else if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) { else if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
DH *dh_srvr, *dh_clnt; DH *dh_clnt = NULL;
if (s->s3->peer_dh_tmp == NULL) { skey = s->s3->peer_tmp;
if (skey == NULL) {
SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE,
ERR_R_INTERNAL_ERROR); ERR_R_INTERNAL_ERROR);
goto err; goto err;
} }
dh_srvr = s->s3->peer_dh_tmp; ckey = ssl_generate_pkey(skey, NID_undef);
/* generate a new random key */ dh_clnt = EVP_PKEY_get0_DH(ckey);
if ((dh_clnt = DHparams_dup(dh_srvr)) == NULL) {
SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB); if (dh_clnt == NULL || ssl_derive(s, ckey, skey) == 0) {
goto err; SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE,
} ERR_R_INTERNAL_ERROR);
if (!DH_generate_key(dh_clnt)) {
SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
DH_free(dh_clnt);
goto err; goto err;
} }
pmslen = DH_size(dh_clnt);
pms = OPENSSL_malloc(pmslen);
if (pms == NULL)
goto memerr;
/*
* use the 'p' output buffer for the DH key, but make sure to
* clear it out afterwards
*/
n = DH_compute_key(pms, dh_srvr->pub_key, dh_clnt);
if (s->s3->peer_dh_tmp == NULL)
DH_free(dh_srvr);
if (n <= 0) {
SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
DH_free(dh_clnt);
goto err;
}
pmslen = n;
/* send off the data */ /* send off the data */
n = BN_num_bytes(dh_clnt->pub_key); n = BN_num_bytes(dh_clnt->pub_key);
s2n(n, p); s2n(n, p);
BN_bn2bin(dh_clnt->pub_key, p); BN_bn2bin(dh_clnt->pub_key, p);
n += 2; n += 2;
EVP_PKEY_free(ckey);
DH_free(dh_clnt); ckey = NULL;
} }
#endif #endif
@@ -2666,6 +2645,8 @@ psk_err:
s->s3->tmp.pms = NULL; s->s3->tmp.pms = NULL;
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
OPENSSL_free(encodedPoint); OPENSSL_free(encodedPoint);
#endif
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
EVP_PKEY_free(ckey); EVP_PKEY_free(ckey);
#endif #endif
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
@@ -2927,9 +2908,6 @@ int ssl3_check_cert_and_algorithm(SSL *s)
#endif #endif
long alg_k, alg_a; long alg_k, alg_a;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
#ifndef OPENSSL_NO_DH
DH *dh;
#endif
int al = SSL_AD_HANDSHAKE_FAILURE; int al = SSL_AD_HANDSHAKE_FAILURE;
alg_k = s->s3->tmp.new_cipher->algorithm_mkey; alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
@@ -2938,9 +2916,6 @@ int ssl3_check_cert_and_algorithm(SSL *s)
/* we don't have a certificate */ /* we don't have a certificate */
if ((alg_a & SSL_aNULL) || (alg_k & SSL_kPSK)) if ((alg_a & SSL_aNULL) || (alg_k & SSL_kPSK))
return (1); return (1);
#ifndef OPENSSL_NO_DH
dh = s->s3->peer_dh_tmp;
#endif
/* This is the passed certificate */ /* This is the passed certificate */
@@ -2989,7 +2964,7 @@ int ssl3_check_cert_and_algorithm(SSL *s)
} }
#endif #endif
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
if ((alg_k & SSL_kDHE) && (dh == NULL)) { if ((alg_k & SSL_kDHE) && (s->s3->peer_tmp == NULL)) {
al = SSL_AD_INTERNAL_ERROR; al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, ERR_R_INTERNAL_ERROR);
goto f_err; goto f_err;