projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More prototypes.
[openssl.git]
/
ssl
/
s2_pkt.c
diff --git
a/ssl/s2_pkt.c
b/ssl/s2_pkt.c
index 84bea33e2efd3976b281d304a319683e3bbf62f3..96d9a1be55142a8b58070f5c41c3c5d1a51f867a 100644
(file)
--- a/
ssl/s2_pkt.c
+++ b/
ssl/s2_pkt.c
@@
-1,5
+1,5
@@
/* ssl/s2_pkt.c */
/* ssl/s2_pkt.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-121,7
+121,7
@@
int len;
}
}
}
}
-
errno=0
;
+
clear_sys_error()
;
s->rwstate=SSL_NOTHING;
if (len <= 0) return(len);
s->rwstate=SSL_NOTHING;
if (len <= 0) return(len);
@@
-231,7
+231,7
@@
int len;
(s->s2->rlength%EVP_CIPHER_CTX_block_size(s->enc_read_ctx) != 0))
{
SSLerr(SSL_F_SSL2_READ,SSL_R_BAD_MAC_DECODE);
(s->s2->rlength%EVP_CIPHER_CTX_block_size(s->enc_read_ctx) != 0))
{
SSLerr(SSL_F_SSL2_READ,SSL_R_BAD_MAC_DECODE);
- return(
SSL_RWERR_BAD_MAC_DECODE
);
+ return(
-1
);
}
}
INC32(s->s2->read_sequence); /* expect next number */
}
}
INC32(s->s2->read_sequence); /* expect next number */
@@
-248,7
+248,7
@@
int len;
else
{
SSLerr(SSL_F_SSL2_READ,SSL_R_BAD_STATE);
else
{
SSLerr(SSL_F_SSL2_READ,SSL_R_BAD_STATE);
- return(
SSL_RWERR_INTERNAL_ERROR
);
+ return(
-1
);
}
}
}
}
@@
-312,7
+312,7
@@
unsigned int extend;
s->packet=s->s2->rbuf;
while (newb < (int)n)
{
s->packet=s->s2->rbuf;
while (newb < (int)n)
{
-
errno=0
;
+
clear_sys_error()
;
if (s->rbio != NULL)
{
s->rwstate=SSL_READING;
if (s->rbio != NULL)
{
s->rwstate=SSL_READING;
@@
-380,7
+380,7
@@
int len;
return(-1);
}
return(-1);
}
-
errno=0
;
+
clear_sys_error()
;
s->rwstate=SSL_NOTHING;
if (len <= 0) return(len);
s->rwstate=SSL_NOTHING;
if (len <= 0) return(len);
@@
-414,15
+414,15
@@
unsigned int len;
/* check that they have given us the same buffer to
* write */
/* check that they have given us the same buffer to
* write */
- if ((s->s2->wpend_tot
!=
(int)len) || (s->s2->wpend_buf != buf))
+ if ((s->s2->wpend_tot
>
(int)len) || (s->s2->wpend_buf != buf))
{
SSLerr(SSL_F_WRITE_PENDING,SSL_R_BAD_WRITE_RETRY);
{
SSLerr(SSL_F_WRITE_PENDING,SSL_R_BAD_WRITE_RETRY);
- return(
SSL_RWERR_BAD_WRITE_RETRY
);
+ return(
-1
);
}
for (;;)
{
}
for (;;)
{
-
errno=0
;
+
clear_sys_error()
;
if (s->wbio != NULL)
{
s->rwstate=SSL_WRITING;
if (s->wbio != NULL)
{
s->rwstate=SSL_WRITING;