diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-12-26 12:07:23 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-12-26 12:07:23 +0000 |
| commit | 725c88879c1e76f2b7e5242a7b87df9e9cd58518 (patch) | |
| tree | befd84228eed73618c6f94e998b5d4121f39594c /ssl | |
| parent | a0aae68cf6f3383f248c0e1991973224f2e4498f (diff) | |
Finish SSL_peek/SSL_pending fixes.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s2_lib.c | 2 | ||||
| -rw-r--r-- | ssl/s2_pkt.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index a89958607c..a590dbfa5c 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -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) diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c index 0ec9ee3393..1f119442b4 100644 --- a/ssl/s2_pkt.c +++ b/ssl/s2_pkt.c @@ -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) { |