提交 5c001c32 编写于 作者: B Ben Laurie

Fix no-gost no-srp no-ec no-dh.

Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 d94ce410
...@@ -2079,7 +2079,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) ...@@ -2079,7 +2079,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
EVP_PKEY *ckey = NULL; EVP_PKEY *ckey = NULL;
#endif #endif
PACKET enc_premaster; PACKET enc_premaster;
const unsigned char *data;
unsigned char *rsa_decrypt = NULL; unsigned char *rsa_decrypt = NULL;
alg_k = s->s3->tmp.new_cipher->algorithm_mkey; 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) ...@@ -2301,6 +2300,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
DH *cdh; DH *cdh;
unsigned int i; unsigned int i;
BIGNUM *pub_key; BIGNUM *pub_key;
const unsigned char *data;
if (!PACKET_get_net_2(pkt, &i)) { if (!PACKET_get_net_2(pkt, &i)) {
if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) { if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
...@@ -2378,6 +2378,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) ...@@ -2378,6 +2378,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
goto f_err; goto f_err;
} else { } else {
unsigned int i; unsigned int i;
const unsigned char *data;
/* /*
* Get client's public key from encoded point in the * 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) ...@@ -2425,6 +2426,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
if (alg_k & SSL_kSRP) { if (alg_k & SSL_kSRP) {
unsigned int i; unsigned int i;
const unsigned char *data;
if (!PACKET_get_net_2(pkt, &i) if (!PACKET_get_net_2(pkt, &i)
|| !PACKET_get_bytes(pkt, &data, i)) { || !PACKET_get_bytes(pkt, &data, i)) {
...@@ -2467,6 +2469,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) ...@@ -2467,6 +2469,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
int Ttag, Tclass; int Ttag, Tclass;
long Tlen; long Tlen;
long sess_key_len; long sess_key_len;
const unsigned char *data;
/* Get our certificate private key */ /* Get our certificate private key */
alg_a = s->s3->tmp.new_cipher->algorithm_auth; alg_a = s->s3->tmp.new_cipher->algorithm_auth;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册