diff options
| author | Bodo Möller <bodo@openssl.org> | 2001-03-08 21:54:02 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2001-03-08 21:54:02 +0000 |
| commit | 5451e0d924e869d05065e7e48b36cbbde6d22838 (patch) | |
| tree | fa7da7ac7b0f78107ff514c4e63c638013a2e2bd /ssl/s23_lib.c | |
| parent | 4ea38555148b23639e8c3e44b70bccbc765b9aa5 (diff) | |
| download | openssl-5451e0d924e869d05065e7e48b36cbbde6d22838.zip openssl-5451e0d924e869d05065e7e48b36cbbde6d22838.tar.gz openssl-5451e0d924e869d05065e7e48b36cbbde6d22838.tar.bz2 | |
add ssl23_peek
Diffstat (limited to 'ssl/s23_lib.c')
| -rw-r--r-- | ssl/s23_lib.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index ec739de..b70002a 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -63,6 +63,7 @@ static int ssl23_num_ciphers(void ); static SSL_CIPHER *ssl23_get_cipher(unsigned int u); static int ssl23_read(SSL *s, void *buf, int len); +static int ssl23_peek(SSL *s, void *buf, int len); static int ssl23_write(SSL *s, const void *buf, int len); static long ssl23_default_timeout(void ); static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); @@ -77,7 +78,7 @@ static SSL_METHOD SSLv23_data= { ssl_undefined_function, ssl_undefined_function, ssl23_read, - (int (*)(struct ssl_st *, char *, int))ssl_undefined_function, + ssl23_peek, ssl23_write, ssl_undefined_function, ssl_undefined_function, @@ -169,13 +170,6 @@ static int ssl23_read(SSL *s, void *buf, int len) { int n; -#if 0 - if (s->shutdown & SSL_RECEIVED_SHUTDOWN) - { - s->rwstate=SSL_NOTHING; - return(0); - } -#endif clear_sys_error(); if (SSL_in_init(s) && (!s->in_handshake)) { @@ -195,17 +189,33 @@ static int ssl23_read(SSL *s, void *buf, int len) } } -static int ssl23_write(SSL *s, const void *buf, int len) +static int ssl23_peek(SSL *s, void *buf, int len) { int n; -#if 0 - if (s->shutdown & SSL_SENT_SHUTDOWN) + clear_sys_error(); + if (SSL_in_init(s) && (!s->in_handshake)) + { + n=s->handshake_func(s); + if (n < 0) return(n); + if (n == 0) + { + SSLerr(SSL_F_SSL23_PEEK,SSL_R_SSL_HANDSHAKE_FAILURE); + return(-1); + } + return(SSL_peek(s,buf,len)); + } + else { - s->rwstate=SSL_NOTHING; - return(0); + ssl_undefined_function(s); + return(-1); } -#endif + } + +static int ssl23_write(SSL *s, const void *buf, int len) + { + int n; + clear_sys_error(); if (SSL_in_init(s) && (!s->in_handshake)) { |