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

Move declaration of i into blocks where it is used.

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Ben Laurie
2016-03-17 18:17:27 +00:00
parent 3fd4d211ae
commit f100b0317e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ssl/statem/statem_srvr.c
View File

@@ -212,7 +212,7 @@ int ossl_statem_server_read_transition(SSL *s, int mt)
if (mt == SSL3_MT_CERTIFICATE) { if (mt == SSL3_MT_CERTIFICATE) {
st->hand_state = TLS_ST_SR_CERT; st->hand_state = TLS_ST_SR_CERT;
return 1; return 1;
} }
} }
break; break;
@@ -1280,7 +1280,7 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL *s, PACKET *pkt)
SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, SSL_R_NO_COMPRESSION_SPECIFIED); SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, SSL_R_NO_COMPRESSION_SPECIFIED);
goto f_err; goto f_err;
} }
/* TLS extensions */ /* TLS extensions */
if (s->version >= SSL3_VERSION) { if (s->version >= SSL3_VERSION) {
if (!ssl_parse_clienthello_tlsext(s, &extensions)) { if (!ssl_parse_clienthello_tlsext(s, &extensions)) {
@@ -2073,7 +2073,6 @@ int tls_construct_certificate_request(SSL *s)
MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
{ {
int al; int al;
unsigned int i;
unsigned long alg_k; unsigned long alg_k;
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
RSA *rsa = NULL; RSA *rsa = NULL;
@@ -2302,6 +2301,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) { if (alg_k & (SSL_kDHE | SSL_kDHEPSK)) {
EVP_PKEY *skey = NULL; EVP_PKEY *skey = NULL;
DH *cdh; DH *cdh;
unsigned int i;
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)) {
@@ -2375,6 +2375,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
SSL_R_MISSING_TMP_ECDH_KEY); SSL_R_MISSING_TMP_ECDH_KEY);
goto f_err; goto f_err;
} else { } else {
unsigned int i;
/* /*
* Get client's public key from encoded point in the * Get client's public key from encoded point in the
* ClientKeyExchange message. * ClientKeyExchange message.
@@ -2420,6 +2422,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
#endif #endif
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
if (alg_k & SSL_kSRP) { if (alg_k & SSL_kSRP) {
unsigned int i;
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)) {
al = SSL_AD_DECODE_ERROR; al = SSL_AD_DECODE_ERROR;