diff options
| author | jkim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
| commit | 3299c3be1ad20ab974be3dd97789e20b68dfa949 (patch) | |
| tree | 466b55a31fe1a87db4dfcbef9e5d2f3e8aec65e1 /crypto/openssl/ssl/s3_pkt.c | |
| parent | c934f5fd2852ea5ed2fcbb043e6cf7316daa7e7e (diff) | |
| parent | 8bd1d6691f94efdce2338dffd823889f6c6b8ed2 (diff) | |
| download | FreeBSD-src-3299c3be1ad20ab974be3dd97789e20b68dfa949.zip FreeBSD-src-3299c3be1ad20ab974be3dd97789e20b68dfa949.tar.gz | |
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'crypto/openssl/ssl/s3_pkt.c')
| -rw-r--r-- | crypto/openssl/ssl/s3_pkt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_pkt.c b/crypto/openssl/ssl/s3_pkt.c index 59011e3..eff7356 100644 --- a/crypto/openssl/ssl/s3_pkt.c +++ b/crypto/openssl/ssl/s3_pkt.c @@ -968,7 +968,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) if (!ssl3_setup_read_buffer(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); |
