Commit b7d222c5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Merge branch 'OpenSSL_0_9_8-stable' of /home/steve/src/git/openssl into OpenSSL_0_9_8-stable

parents a93cc7c5 8988407a

doc/ssl/SSL_CTX_set_client_CA_list.pod

+4 −4
Original line number Diff line number Diff line
@@ -66,16 +66,16 @@ values: 


=over 4



=item 1



The operation succeeded.



=item 0



A failure while manipulating the STACK_OF(X509_NAME) object occurred or

the X509_NAME could not be extracted from B<cacert>. Check the error stack

to find out the reason.



=item 1



The operation succeeded.



=back



=head1 EXAMPLES

doc/ssl/SSL_accept.pod

+5 −5
Original line number Diff line number Diff line
@@ -44,17 +44,17 @@ The following return values can occur: 


=over 4



=item 1



The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been

established.



=item 0



The TLS/SSL handshake was not successful but was shut down controlled and

by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the

return value B<ret> to find out the reason.



=item 1



The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been

established.



=item E<lt>0



The TLS/SSL handshake was not successful because a fatal error occurred either

doc/ssl/SSL_connect.pod

+5 −5
Original line number Diff line number Diff line
@@ -41,17 +41,17 @@ The following return values can occur: 


=over 4



=item 1



The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been

established.



=item 0



The TLS/SSL handshake was not successful but was shut down controlled and

by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the

return value B<ret> to find out the reason.



=item 1



The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been

established.



=item E<lt>0



The TLS/SSL handshake was not successful, because a fatal error occurred either

doc/ssl/SSL_do_handshake.pod

+5 −5
Original line number Diff line number Diff line
@@ -45,17 +45,17 @@ The following return values can occur: 


=over 4



=item 1



The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been

established.



=item 0



The TLS/SSL handshake was not successful but was shut down controlled and

by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the

return value B<ret> to find out the reason.



=item 1



The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been

established.



=item E<lt>0



The TLS/SSL handshake was not successful because a fatal error occurred either

doc/ssl/SSL_shutdown.pod

+5 −5
Original line number Diff line number Diff line
@@ -92,11 +92,6 @@ The following return values can occur: 


=over 4



=item 1



The shutdown was successfully completed. The "close notify" alert was sent

and the peer's "close notify" alert was received.



=item 0



The shutdown is not yet finished. Call SSL_shutdown() for a second time,
@@ -104,6 +99,11 @@ if a bidirectional shutdown shall be performed. 
The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an

erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.



=item 1



The shutdown was successfully completed. The "close notify" alert was sent

and the peer's "close notify" alert was received.



=item -1



The shutdown was not successful because a fatal error occurred either