From dcf41c369c66abeda9455a63d221f867cb78f343 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Thu, 18 Jun 2015 22:51:05 +0000
Subject: Remove Microsoft Server Gated Crypto.

Another relic due to the old US crypto policy.

From OpenSSL commit 63eab8a620944a990ab3985620966ccd9f48d681 and
95275599399e277e71d064790a1f828a99fc661a.

ok jsing@ miod@
---
 src/lib/libssl/doc/BIO_f_ssl.3        |  6 +++---
 src/lib/libssl/doc/SSL_accept.3       | 16 +++-------------
 src/lib/libssl/doc/SSL_do_handshake.3 | 18 +++---------------
 3 files changed, 9 insertions(+), 31 deletions(-)

(limited to 'src/lib/libssl/doc')

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 @@
 .\"
-.\"	$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/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 @@
 .\"
-.\"	$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/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 @@
 .\"
-.\"	$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
-- 
cgit v1.2.3-55-g6feb