diff options
| author | Ben Laurie <ben@links.org> | 2016-04-19 08:25:58 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2016-04-27 12:36:30 +0100 |
| commit | 5c001c326d7731042a602a171f1363191e9b0336 (patch) | |
| tree | 83c6c85a9085d3349d4456565155396995442f7e /ssl | |
| parent | d94ce4100fb39dc12ceec38b1d14267a4c7e64b3 (diff) | |
| download | openssl-new-5c001c326d7731042a602a171f1363191e9b0336.tar.gz | |
Fix no-gost no-srp no-ec no-dh.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/statem_srvr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 38fa9455ff..4bb22e5543 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -2079,7 +2079,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) EVP_PKEY *ckey = NULL; #endif PACKET enc_premaster; - const unsigned char *data; unsigned char *rsa_decrypt = NULL; alg_k = s->s3->tmp.new_cipher->algorithm_mkey; @@ -2301,6 +2300,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) DH *cdh; unsigned int i; BIGNUM *pub_key; + const unsigned char *data; if (!PACKET_get_net_2(pkt, &i)) { if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) { @@ -2378,6 +2378,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) goto f_err; } else { unsigned int i; + const unsigned char *data; /* * Get client's public key from encoded point in the @@ -2425,6 +2426,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) #ifndef OPENSSL_NO_SRP if (alg_k & SSL_kSRP) { unsigned int i; + const unsigned char *data; if (!PACKET_get_net_2(pkt, &i) || !PACKET_get_bytes(pkt, &data, i)) { @@ -2467,6 +2469,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) int Ttag, Tclass; long Tlen; long sess_key_len; + const unsigned char *data; /* Get our certificate private key */ alg_a = s->s3->tmp.new_cipher->algorithm_auth; |