projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
326de18
)
Remove redundant check.
author
Ken Ballou
<ballou@crab.mv.com>
Fri, 27 Jun 2014 22:17:47 +0000
(23:17 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Fri, 27 Jun 2014 22:18:40 +0000
(23:18 +0100)
PR#3174
(cherry picked from commit
fd331c0bb9b557903dd2ce88398570a3327b5ef0
)
ssl/s3_pkt.c
patch
|
blob
|
history
diff --git
a/ssl/s3_pkt.c
b/ssl/s3_pkt.c
index a419470649363493612c5b93cd8b32a0b09eb5ef..dbbee635c93449e804e3115f818708dc3ee24422 100644
(file)
--- a/
ssl/s3_pkt.c
+++ b/
ssl/s3_pkt.c
@@
-838,7
+838,7
@@
int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
if (!ssl3_setup_buffers(s))
return(-1);
- if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE)
&& type
) ||
+ if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE)) ||
(peek && (type != SSL3_RT_APPLICATION_DATA)))
{
SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);