Finish SSL_peek/SSL_pending fixes.
authorBodo Möller <bodo@openssl.org>
Tue, 26 Dec 2000 12:07:23 +0000 (12:07 +0000)
committerBodo Möller <bodo@openssl.org>
Tue, 26 Dec 2000 12:07:23 +0000 (12:07 +0000)
CHANGES
ssl/s2_lib.c
ssl/s2_pkt.c

diff --git a/CHANGES b/CHANGES
index ccb179e..95085ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
 
   *) Fix ssl3_pending: If the record in s->s3->rrec is not of type
      SSL3_RT_APPLICATION_DATA, return 0.
+     Similarly, change ssl2_pending to return 0 if SSL_in_init(s) is true.
      [Bodo Moeller]
 
   *) Fix SSL_peek:
index a899586..a590dbf 100644 (file)
@@ -260,7 +260,7 @@ SSL_CIPHER *ssl2_get_cipher(unsigned int u)
 
 int ssl2_pending(SSL *s)
        {
-       return(s->s2->ract_data_length);
+       return SSL_in_init(s) ? 0 : s->s2->ract_data_length;
        }
 
 int ssl2_new(SSL *s)
index 0ec9ee3..1f11944 100644 (file)
@@ -132,12 +132,6 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
        int i;
        unsigned int mac_size=0;
 
-       if (peek)
-               {
-               SSLerr(SSL_F_SSL2_READ_INTERNAL, SSL_R_FIXME); /* proper implementation not yet completed */
-               return -1;
-               }
-
  ssl2_read_again:
        if (SSL_in_init(s) && !s->in_handshake)
                {