Fix SSL_peek and SSL_pending.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index f2bfb15a5a8ee3a4f72f16ac1c0ae5c6b5f5d091..47768cc281e8fdc6eb81fde8c5f3dc51d2f60947 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -782,8 +782,7 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u)
 
 int ssl3_pending(SSL *s)
        {
-       /* The problem is that it may not be the correct record type */
-       return(s->s3->rrec.length); /* FIXME */
+       return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
        }
 
 int ssl3_new(SSL *s)