diff options
| author | Ben Laurie <ben@links.org> | 2016-03-17 18:17:27 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2016-03-22 11:15:06 +0000 |
| commit | f100b0317eea8df3510b4b6ccf46837872c288cf (patch) | |
| tree | fdad8969bf5c93282113315066990609fcfa0bc1 /ssl | |
| parent | 3fd4d211aec1f9d1890c870f55517ff0bd89ee56 (diff) | |
Move declaration of i into blocks where it is used.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/statem_srvr.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 2f2f457074..983b8211ba 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -212,7 +212,7 @@ int ossl_statem_server_read_transition(SSL *s, int mt) if (mt == SSL3_MT_CERTIFICATE) { st->hand_state = TLS_ST_SR_CERT; return 1; - } + } } 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); goto f_err; } - + /* TLS extensions */ if (s->version >= SSL3_VERSION) { 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) { int al; - unsigned int i; unsigned long alg_k; #ifndef OPENSSL_NO_RSA 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)) { EVP_PKEY *skey = NULL; DH *cdh; + unsigned int i; if (!PACKET_get_net_2(pkt, &i)) { 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); goto f_err; } else { + unsigned int i; + /* * Get client's public key from encoded point in the * ClientKeyExchange message. @@ -2420,6 +2422,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) #endif #ifndef OPENSSL_NO_SRP if (alg_k & SSL_kSRP) { + unsigned int i; + if (!PACKET_get_net_2(pkt, &i) || !PACKET_get_bytes(pkt, &data, i)) { al = SSL_AD_DECODE_ERROR; |