diff options
| author |   doug <doug@openbsd.org> | 2015-06-18 22:51:05 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-06-18 22:51:05 +0000 |
| commit | b61b6f46711cf71d9da65c3508277c3dc74c08a7 (patch) | |
| tree | 173f4977c07fdfd4635256c2990ce7dde24a8ca1 /lib/libssl/src/doc/ssl | |
| parent | Change DTLS client cert request code to match TLS. (diff) | |
| download | wireguard-openbsd-b61b6f46711cf71d9da65c3508277c3dc74c08a7.tar.xz wireguard-openbsd-b61b6f46711cf71d9da65c3508277c3dc74c08a7.zip | |
Remove Microsoft Server Gated Crypto.
Another relic due to the old US crypto policy.
From OpenSSL commit 63eab8a620944a990ab3985620966ccd9f48d681 and
95275599399e277e71d064790a1f828a99fc661a.
ok jsing@ miod@
Diffstat (limited to 'lib/libssl/src/doc/ssl')
| -rw-r--r-- | lib/libssl/src/doc/ssl/BIO_f_ssl.3 | 6 | ||||
| -rw-r--r-- | lib/libssl/src/doc/ssl/SSL_accept.3 | 16 | ||||
| -rw-r--r-- | lib/libssl/src/doc/ssl/SSL_do_handshake.3 | 18 |
3 files changed, 9 insertions, 31 deletions
diff --git a/lib/libssl/src/doc/ssl/BIO_f_ssl.3 b/lib/libssl/src/doc/ssl/BIO_f_ssl.3 index 851e4f08ca4..876018a8399 100644 --- a/lib/libssl/src/doc/ssl/BIO_f_ssl.3 +++ b/lib/libssl/src/doc/ssl/BIO_f_ssl.3 @@ -1,7 +1,7 @@ .\" -.\" $OpenBSD: BIO_f_ssl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ +.\" $OpenBSD: BIO_f_ssl.3,v 1.3 2015/06/18 22:51:05 doug Exp $ .\" -.Dd $Mdocdate: December 2 2014 $ +.Dd $Mdocdate: June 18 2015 $ .Dt BIO_F_SSL 3 .Os .Sh NAME @@ -240,7 +240,7 @@ still request a retry in exceptional circumstances. Specifically this will happen if a session renegotiation takes place during a .Xr BIO_read 3 operation. -One case where this happens is when SGC or step up occurs. +One case where this happens is when step up occurs. .Pp In OpenSSL 0.9.6 and later the SSL flag .Dv SSL_AUTO_RETRY diff --git a/lib/libssl/src/doc/ssl/SSL_accept.3 b/lib/libssl/src/doc/ssl/SSL_accept.3 index 06465d19558..8c7409d04f3 100644 --- a/lib/libssl/src/doc/ssl/SSL_accept.3 +++ b/lib/libssl/src/doc/ssl/SSL_accept.3 @@ -1,7 +1,7 @@ .\" -.\" $OpenBSD: SSL_accept.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ +.\" $OpenBSD: SSL_accept.3,v 1.3 2015/06/18 22:51:05 doug Exp $ .\" -.Dd $Mdocdate: December 2 2014 $ +.Dd $Mdocdate: June 18 2015 $ .Dt SSL_ACCEPT 3 .Os .Sh NAME @@ -29,17 +29,7 @@ If the underlying is .Em blocking , .Fn SSL_accept -will only return once the handshake has been finished or an error occurred, -except for SGC (Server Gated Cryptography). -For SGC, -.Fn SSL_accept -may return with \(mi1, but -.Fn SSL_get_error -will yield -.Dv SSL_ERROR_WANT_READ/WRITE -and -.Fn SSL_accept -should be called again. +will only return once the handshake has been finished or an error occurred. .Pp If the underlying .Vt BIO diff --git a/lib/libssl/src/doc/ssl/SSL_do_handshake.3 b/lib/libssl/src/doc/ssl/SSL_do_handshake.3 index cc29df25837..78a37b08c94 100644 --- a/lib/libssl/src/doc/ssl/SSL_do_handshake.3 +++ b/lib/libssl/src/doc/ssl/SSL_do_handshake.3 @@ -1,7 +1,7 @@ .\" -.\" $OpenBSD: SSL_do_handshake.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ +.\" $OpenBSD: SSL_do_handshake.3,v 1.3 2015/06/18 22:51:05 doug Exp $ .\" -.Dd $Mdocdate: December 2 2014 $ +.Dd $Mdocdate: June 18 2015 $ .Dt SSL_DO_HANDSHAKE 3 .Os .Sh NAME @@ -30,19 +30,7 @@ If the underlying is .Em blocking , .Fn SSL_do_handshake -will only return once the handshake has been finished or an error occurred, -except for SGC (Server Gated Cryptography). -For SGC, -.Fn SSL_do_handshake -may return with \(mi1, but -.Xr SSL_get_error 3 -will yield -.Dv SSL_ERROR_WANT_READ -or -.Dv SSL_ERROR_WANT_WRITE -and -.Fn SSL_do_handshake -should be called again. +will only return once the handshake has been finished or an error occurred. .Pp If the underlying .Vt BIO |