diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-12-25 18:40:46 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-12-25 18:40:46 +0000 |
| commit | a0aae68cf6f3383f248c0e1991973224f2e4498f (patch) | |
| tree | 00a32cf8d31ede67946750c91b26f7ddd3647f7c /doc/ssl | |
| parent | 57d2f21782631c735ed134ee4fb0d682426e1522 (diff) | |
| download | openssl-a0aae68cf6f3383f248c0e1991973224f2e4498f.tar.gz | |
Fix SSL_peek and SSL_pending.
Diffstat (limited to 'doc/ssl')
| -rw-r--r-- | doc/ssl/SSL_get_error.pod | 12 | ||||
| -rw-r--r-- | doc/ssl/SSL_pending.pod | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/ssl/SSL_get_error.pod b/doc/ssl/SSL_get_error.pod index bd6872f61f..fefaf61936 100644 --- a/doc/ssl/SSL_get_error.pod +++ b/doc/ssl/SSL_get_error.pod @@ -14,8 +14,8 @@ SSL_get_error - obtain result code for TLS/SSL I/O operation SSL_get_error() returns a result code (suitable for the C "switch" statement) for a preceding call to SSL_connect(), SSL_accept(), -SSL_read(), or SSL_write() on B<ssl>. The value returned by that -TLS/SSL I/O function must be passed to SSL_get_error() in parameter +SSL_read(), SSL_peek(), or SSL_write() on B<ssl>. The value returned by +that TLS/SSL I/O function must be passed to SSL_get_error() in parameter B<ret>. In addition to B<ssl> and B<ret>, SSL_get_error() inspects the @@ -64,10 +64,10 @@ TLS/SSL I/O function should be retried. Caveat: Any TLS/SSL I/O function can lead to either of B<SSL_ERROR_WANT_READ> and B<SSL_ERROR_WANT_WRITE>. In particular, -SSL_read() may want to write data and SSL_write() may want to read -data. This is mainly because TLS/SSL handshakes may occur at any time -during the protocol (initiated by either the client or the server); -SSL_read() and SSL_write() will handle any pending handshakes. +SSL_read() or SSL_peek() may want to write data and SSL_write() may want +to read data. This is mainly because TLS/SSL handshakes may occur at any +time during the protocol (initiated by either the client or the server); +SSL_read(), SSL_peek(), and SSL_write() will handle any pending handshakes. =item SSL_ERROR_WANT_X509_LOOKUP diff --git a/doc/ssl/SSL_pending.pod b/doc/ssl/SSL_pending.pod index 6c03b14caf..b4c48598b2 100644 --- a/doc/ssl/SSL_pending.pod +++ b/doc/ssl/SSL_pending.pod @@ -33,8 +33,8 @@ I<read_ahead> flag is set, additional protocol bytes may have been read containing more TLS/SSL records; these are ignored by SSL_pending(). -SSL_pending() does not check if the record type of pending data is -application data. +Up to OpenSSL 0.9.6, SSL_pending() does not check if the record type +of pending data is application data. =head1 SEE ALSO |