The previous revision should have generated _more_ warnings, not less ...
The return value of handshake_func is signed, not unsigned.
This commit is contained in:
10
ssl/s3_pkt.c
10
ssl/s3_pkt.c
@@ -706,8 +706,8 @@ static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
|
|||||||
*/
|
*/
|
||||||
int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
|
int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
|
||||||
{
|
{
|
||||||
int al,j,ret;
|
int al,i,j,ret;
|
||||||
unsigned int i,n;
|
unsigned int n;
|
||||||
SSL3_RECORD *rr;
|
SSL3_RECORD *rr;
|
||||||
void (*cb)()=NULL;
|
void (*cb)()=NULL;
|
||||||
|
|
||||||
@@ -890,9 +890,9 @@ start:
|
|||||||
ssl3_renegotiate(s);
|
ssl3_renegotiate(s);
|
||||||
if (ssl3_renegotiate_check(s))
|
if (ssl3_renegotiate_check(s))
|
||||||
{
|
{
|
||||||
n=s->handshake_func(s);
|
i=s->handshake_func(s);
|
||||||
if (n < 0) return(n);
|
if (i < 0) return(i);
|
||||||
if (n == 0)
|
if (i == 0)
|
||||||
{
|
{
|
||||||
SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
|
SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
|
||||||
return(-1);
|
return(-1);
|
||||||
|
|||||||
Reference in New Issue
Block a user