diff options
Diffstat (limited to 'src/lib/libssl/doc')
-rw-r--r-- | src/lib/libssl/doc/BIO_f_ssl.3 | 6 | ||||
-rw-r--r-- | src/lib/libssl/doc/SSL_accept.3 | 16 | ||||
-rw-r--r-- | src/lib/libssl/doc/SSL_do_handshake.3 | 18 |
3 files changed, 9 insertions, 31 deletions
diff --git a/src/lib/libssl/doc/BIO_f_ssl.3 b/src/lib/libssl/doc/BIO_f_ssl.3 index 851e4f08ca..876018a839 100644 --- a/src/lib/libssl/doc/BIO_f_ssl.3 +++ b/src/lib/libssl/doc/BIO_f_ssl.3 | |||
@@ -1,7 +1,7 @@ | |||
1 | .\" | 1 | .\" |
2 | .\" $OpenBSD: BIO_f_ssl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ | 2 | .\" $OpenBSD: BIO_f_ssl.3,v 1.3 2015/06/18 22:51:05 doug Exp $ |
3 | .\" | 3 | .\" |
4 | .Dd $Mdocdate: December 2 2014 $ | 4 | .Dd $Mdocdate: June 18 2015 $ |
5 | .Dt BIO_F_SSL 3 | 5 | .Dt BIO_F_SSL 3 |
6 | .Os | 6 | .Os |
7 | .Sh NAME | 7 | .Sh NAME |
@@ -240,7 +240,7 @@ still request a retry in exceptional circumstances. | |||
240 | Specifically this will happen if a session renegotiation takes place during a | 240 | Specifically this will happen if a session renegotiation takes place during a |
241 | .Xr BIO_read 3 | 241 | .Xr BIO_read 3 |
242 | operation. | 242 | operation. |
243 | One case where this happens is when SGC or step up occurs. | 243 | One case where this happens is when step up occurs. |
244 | .Pp | 244 | .Pp |
245 | In OpenSSL 0.9.6 and later the SSL flag | 245 | In OpenSSL 0.9.6 and later the SSL flag |
246 | .Dv SSL_AUTO_RETRY | 246 | .Dv SSL_AUTO_RETRY |
diff --git a/src/lib/libssl/doc/SSL_accept.3 b/src/lib/libssl/doc/SSL_accept.3 index 06465d1955..8c7409d04f 100644 --- a/src/lib/libssl/doc/SSL_accept.3 +++ b/src/lib/libssl/doc/SSL_accept.3 | |||
@@ -1,7 +1,7 @@ | |||
1 | .\" | 1 | .\" |
2 | .\" $OpenBSD: SSL_accept.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ | 2 | .\" $OpenBSD: SSL_accept.3,v 1.3 2015/06/18 22:51:05 doug Exp $ |
3 | .\" | 3 | .\" |
4 | .Dd $Mdocdate: December 2 2014 $ | 4 | .Dd $Mdocdate: June 18 2015 $ |
5 | .Dt SSL_ACCEPT 3 | 5 | .Dt SSL_ACCEPT 3 |
6 | .Os | 6 | .Os |
7 | .Sh NAME | 7 | .Sh NAME |
@@ -29,17 +29,7 @@ If the underlying | |||
29 | is | 29 | is |
30 | .Em blocking , | 30 | .Em blocking , |
31 | .Fn SSL_accept | 31 | .Fn SSL_accept |
32 | will only return once the handshake has been finished or an error occurred, | 32 | will only return once the handshake has been finished or an error occurred. |
33 | except for SGC (Server Gated Cryptography). | ||
34 | For SGC, | ||
35 | .Fn SSL_accept | ||
36 | may return with \(mi1, but | ||
37 | .Fn SSL_get_error | ||
38 | will yield | ||
39 | .Dv SSL_ERROR_WANT_READ/WRITE | ||
40 | and | ||
41 | .Fn SSL_accept | ||
42 | should be called again. | ||
43 | .Pp | 33 | .Pp |
44 | If the underlying | 34 | If the underlying |
45 | .Vt BIO | 35 | .Vt BIO |
diff --git a/src/lib/libssl/doc/SSL_do_handshake.3 b/src/lib/libssl/doc/SSL_do_handshake.3 index cc29df2583..78a37b08c9 100644 --- a/src/lib/libssl/doc/SSL_do_handshake.3 +++ b/src/lib/libssl/doc/SSL_do_handshake.3 | |||
@@ -1,7 +1,7 @@ | |||
1 | .\" | 1 | .\" |
2 | .\" $OpenBSD: SSL_do_handshake.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ | 2 | .\" $OpenBSD: SSL_do_handshake.3,v 1.3 2015/06/18 22:51:05 doug Exp $ |
3 | .\" | 3 | .\" |
4 | .Dd $Mdocdate: December 2 2014 $ | 4 | .Dd $Mdocdate: June 18 2015 $ |
5 | .Dt SSL_DO_HANDSHAKE 3 | 5 | .Dt SSL_DO_HANDSHAKE 3 |
6 | .Os | 6 | .Os |
7 | .Sh NAME | 7 | .Sh NAME |
@@ -30,19 +30,7 @@ If the underlying | |||
30 | is | 30 | is |
31 | .Em blocking , | 31 | .Em blocking , |
32 | .Fn SSL_do_handshake | 32 | .Fn SSL_do_handshake |
33 | will only return once the handshake has been finished or an error occurred, | 33 | will only return once the handshake has been finished or an error occurred. |
34 | except for SGC (Server Gated Cryptography). | ||
35 | For SGC, | ||
36 | .Fn SSL_do_handshake | ||
37 | may return with \(mi1, but | ||
38 | .Xr SSL_get_error 3 | ||
39 | will yield | ||
40 | .Dv SSL_ERROR_WANT_READ | ||
41 | or | ||
42 | .Dv SSL_ERROR_WANT_WRITE | ||
43 | and | ||
44 | .Fn SSL_do_handshake | ||
45 | should be called again. | ||
46 | .Pp | 34 | .Pp |
47 | If the underlying | 35 | If the underlying |
48 | .Vt BIO | 36 | .Vt BIO |