mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
Fix a shadowed variable declaration warning
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
parent
47263ace13
commit
ac0edec108
@ -88,7 +88,7 @@ static int ssl_free(BIO *a)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ssl_read(BIO *b, char *out, size_t outl, size_t *read)
|
static int ssl_read(BIO *b, char *out, size_t outl, size_t *readbytes)
|
||||||
{
|
{
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
BIO_SSL *sb;
|
BIO_SSL *sb;
|
||||||
@ -108,14 +108,14 @@ static int ssl_read(BIO *b, char *out, size_t outl, size_t *read)
|
|||||||
|
|
||||||
ret = SSL_read(ssl, out, outl);
|
ret = SSL_read(ssl, out, outl);
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
*read = ret;
|
*readbytes = ret;
|
||||||
|
|
||||||
switch (SSL_get_error(ssl, ret)) {
|
switch (SSL_get_error(ssl, ret)) {
|
||||||
case SSL_ERROR_NONE:
|
case SSL_ERROR_NONE:
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
break;
|
break;
|
||||||
if (sb->renegotiate_count > 0) {
|
if (sb->renegotiate_count > 0) {
|
||||||
sb->byte_count += *read;
|
sb->byte_count += *readbytes;
|
||||||
if (sb->byte_count > sb->renegotiate_count) {
|
if (sb->byte_count > sb->renegotiate_count) {
|
||||||
sb->byte_count = 0;
|
sb->byte_count = 0;
|
||||||
sb->num_renegotiates++;
|
sb->num_renegotiates++;
|
||||||
|
Loading…
Reference in New Issue
Block a user