summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2016-12-16 15:39:09 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2016-12-16 15:39:09 +0000
commitfd4bc274e5449b87ccda672056223fa3580c4a57 (patch)
treefdb0c62728f23c1cf345f8e8f46bfb6a03916289
parent03dea8e2cfe1120ef8021273aca951ef8cce80af (diff)
various minor cleanup;
-rw-r--r--lib/libssl/man/BIO_f_ssl.310
-rw-r--r--lib/libssl/man/SSL_CTX_set_cert_store.36
-rw-r--r--lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.36
-rw-r--r--lib/libssl/man/SSL_CTX_set_verify.36
-rw-r--r--lib/libssl/man/SSL_connect.36
-rw-r--r--lib/libssl/man/SSL_do_handshake.36
-rw-r--r--lib/libssl/man/SSL_load_client_CA_file.36
-rw-r--r--lib/libssl/man/SSL_set_max_send_fragment.38
-rw-r--r--lib/libssl/man/SSL_want.36
-rw-r--r--lib/libssl/man/ssl.38
10 files changed, 34 insertions, 34 deletions
diff --git a/lib/libssl/man/BIO_f_ssl.3 b/lib/libssl/man/BIO_f_ssl.3
index 39a40d77150..df2dbc537cc 100644
--- a/lib/libssl/man/BIO_f_ssl.3
+++ b/lib/libssl/man/BIO_f_ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_f_ssl.3,v 1.2 2016/11/14 19:27:16 schwarze Exp $
+.\" $OpenBSD: BIO_f_ssl.3,v 1.3 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 14 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt BIO_F_SSL 3
.Os
.Sh NAME
@@ -136,7 +136,7 @@ communicates using the SSL protocol with
the
.Vt SSL Ns 's
read and write
-.Vt BIO Ns s.
+.Vt BIO Ns s .
If an SSL connection is not established then an attempt is made to establish
one on the first I/O call.
.Pp
@@ -150,7 +150,7 @@ using
it is automatically used as the
.Vt SSL
.Vt BIO Ns 's read and write
-.Vt BIO Ns s.
+.Vt BIO Ns s .
.Pp
Calling
.Xr BIO_reset 3
@@ -159,7 +159,7 @@ on an
.Vt BIO
closes down any current SSL connection by calling
.Xr SSL_shutdown 3 .
-.Xr BIO_reset
+.Xr BIO_reset 3
is then sent to the next
.Vt BIO
in the chain; this will typically disconnect the underlying transport.
diff --git a/lib/libssl/man/SSL_CTX_set_cert_store.3 b/lib/libssl/man/SSL_CTX_set_cert_store.3
index 6def79df5e4..59e5db7fed6 100644
--- a/lib/libssl/man/SSL_CTX_set_cert_store.3
+++ b/lib/libssl/man/SSL_CTX_set_cert_store.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_cert_store.3,v 1.2 2016/11/30 17:22:42 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_cert_store.3,v 1.3 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
.\"
.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 30 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_CTX_SET_CERT_STORE 3
.Os
.Sh NAME
@@ -72,7 +72,7 @@ If another
object is currently set in
.Fa ctx ,
it will be
-.Xr X509_STORE_free 3 Ns ed.
+.Xr X509_STORE_free 3 Ns ed .
.Pp
.Fn SSL_CTX_get_cert_store
returns a pointer to the current certificate verification storage.
diff --git a/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 b/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
index 5009f298580..1aee2d65dd6 100644
--- a/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
+++ b/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_tlsext_ticket_key_cb.3,v 1.1 2016/12/01 21:12:49 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_tlsext_ticket_key_cb.3,v 1.2 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
.\"
.\" This file was written by Rich Salz <rsalz@akamai.com>
@@ -48,7 +48,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 1 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_CTX_SET_TLSEXT_TICKET_KEY_CB 3
.Os
.Sh NAME
@@ -86,7 +86,7 @@ that per session state is unnecessary and a small set of cryptographic
variables needs to be maintained by the callback function
implementation.
.Pp
-In order to reuse a session, a TLS client must send the a session ticket
+In order to reuse a session, a TLS client must send a session ticket
extension to the server.
The client can only send exactly one session ticket.
The server, through the callback function, either agrees to reuse the
diff --git a/lib/libssl/man/SSL_CTX_set_verify.3 b/lib/libssl/man/SSL_CTX_set_verify.3
index b1119447cbb..911c26edf21 100644
--- a/lib/libssl/man/SSL_CTX_set_verify.3
+++ b/lib/libssl/man/SSL_CTX_set_verify.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_verify.3,v 1.2 2016/12/01 22:04:22 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_verify.3,v 1.3 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
.\"
.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -49,7 +49,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 1 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_CTX_SET_VERIFY 3
.Os
.Sh NAME
@@ -180,7 +180,7 @@ handshake is immediately terminated with a
.Dq handshake failure
alert.
This flag must be used together with
-.Dv SSL_VERIFY_PEER.
+.Dv SSL_VERIFY_PEER .
.Pp
.Em Client mode:
ignored
diff --git a/lib/libssl/man/SSL_connect.3 b/lib/libssl/man/SSL_connect.3
index 1b95a1e321e..7fe167dd869 100644
--- a/lib/libssl/man/SSL_connect.3
+++ b/lib/libssl/man/SSL_connect.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_connect.3,v 1.3 2016/12/06 12:24:33 schwarze Exp $
+.\" $OpenBSD: SSL_connect.3,v 1.4 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
.\"
.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -49,7 +49,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 6 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_CONNECT 3
.Os
.Sh NAME
@@ -132,7 +132,7 @@ at the protocol level or a connection failure occurred.
The shutdown was not clean.
It can also occur if action is needed to continue the operation for
non-blocking
-.Vt BIO Ns s.
+.Vt BIO Ns s .
Call
.Xr SSL_get_error 3
with the return value
diff --git a/lib/libssl/man/SSL_do_handshake.3 b/lib/libssl/man/SSL_do_handshake.3
index 6350ce9c90d..df220595649 100644
--- a/lib/libssl/man/SSL_do_handshake.3
+++ b/lib/libssl/man/SSL_do_handshake.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_do_handshake.3,v 1.3 2016/12/06 12:24:33 schwarze Exp $
+.\" $OpenBSD: SSL_do_handshake.3,v 1.4 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
.\"
.\" This file was written by Martin Sjoegren <martin@strakt.com>.
@@ -48,7 +48,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 6 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_DO_HANDSHAKE 3
.Os
.Sh NAME
@@ -132,7 +132,7 @@ at the protocol level or a connection failure occurred.
The shutdown was not clean.
It can also occur if action is needed to continue the operation for
non-blocking
-.Vt BIO Ns s.
+.Vt BIO Ns s .
Call
.Xr SSL_get_error 3
with the return value
diff --git a/lib/libssl/man/SSL_load_client_CA_file.3 b/lib/libssl/man/SSL_load_client_CA_file.3
index 7f71d7b82aa..ed4a21ef6f9 100644
--- a/lib/libssl/man/SSL_load_client_CA_file.3
+++ b/lib/libssl/man/SSL_load_client_CA_file.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_load_client_CA_file.3,v 1.4 2016/12/14 16:20:28 schwarze Exp $
+.\" $OpenBSD: SSL_load_client_CA_file.3,v 1.5 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
.\"
.\" This file is a derived work.
@@ -65,7 +65,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 14 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_LOAD_CLIENT_CA_FILE 3
.Os
.Sh NAME
@@ -115,7 +115,7 @@ do not add it again.
returns a pointer to the new
.Vt STACK_OF(X509_NAME)
or
-.Dv NULL on failure.
+.Dv NULL on failure .
.Pp
.Fn SSL_add_file_cert_subjects_to_stack
and
diff --git a/lib/libssl/man/SSL_set_max_send_fragment.3 b/lib/libssl/man/SSL_set_max_send_fragment.3
index 1e1dbf42229..a78016b99ef 100644
--- a/lib/libssl/man/SSL_set_max_send_fragment.3
+++ b/lib/libssl/man/SSL_set_max_send_fragment.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_set_max_send_fragment.3,v 1.1 2016/12/01 19:40:05 schwarze Exp $
+.\" $OpenBSD: SSL_set_max_send_fragment.3,v 1.2 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL doc/man3/SSL_CTX_set_split_send_fragment.pod
.\" OpenSSL 6782e5fd Oct 21 16:16:20 2016 +0100
.\"
@@ -49,7 +49,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 1 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_SET_MAX_SEND_FRAGMENT 3
.Os
.Sh NAME
@@ -77,8 +77,8 @@ set the
parameter for SSL_CTX and SSL objects respectively.
This value restricts the amount of plaintext bytes that will be sent in
any one SSL/TLS record.
-By default its value is SSL3_RT_MAX_PLAIN_LENGTH (16384). These
-functions will only accept a value in the range 512 -
+By default its value is SSL3_RT_MAX_PLAIN_LENGTH (16384).
+These functions will only accept a value in the range 512 -
SSL3_RT_MAX_PLAIN_LENGTH.
.Pp
These functions are implemented using macros.
diff --git a/lib/libssl/man/SSL_want.3 b/lib/libssl/man/SSL_want.3
index 1aee0b8fe35..4736d62ca0f 100644
--- a/lib/libssl/man/SSL_want.3
+++ b/lib/libssl/man/SSL_want.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_want.3,v 1.2 2016/12/04 12:20:54 schwarze Exp $
+.\" $OpenBSD: SSL_want.3,v 1.3 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
.\"
.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 4 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL_WANT 3
.Os
.Sh NAME
@@ -127,7 +127,7 @@ operation.
A call to
.Xr SSL_get_error 3
should return
-.Dv SSL_ERROR_WANT_READ.
+.Dv SSL_ERROR_WANT_READ .
.It Dv SSL_X509_LOOKUP
The operation did not complete because an application callback set by
.Xr SSL_CTX_set_client_cert_cb 3
diff --git a/lib/libssl/man/ssl.3 b/lib/libssl/man/ssl.3
index 563e2bce13e..e45e02e1aeb 100644
--- a/lib/libssl/man/ssl.3
+++ b/lib/libssl/man/ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssl.3,v 1.4 2016/12/10 18:11:51 schwarze Exp $
+.\" $OpenBSD: ssl.3,v 1.5 2016/12/16 15:39:08 jmc Exp $
.\" OpenSSL e330f55d Nov 11 00:51:04 2016 +0100
.\"
.\" This file was written by Ralf S. Engelschall <rse@openssl.org>,
@@ -50,7 +50,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 10 2016 $
+.Dd $Mdocdate: December 16 2016 $
.Dt SSL 3
.Os
.Sh NAME
@@ -123,7 +123,8 @@ structures which are later created for the connections.
.It Vt SSL_SESSION No (SSL Session)
This is a structure containing the current TLS/SSL session details for a
connection:
-.Vt SSL_CIPHER Ns s, client and server certificates, keys, etc.
+.Vt SSL_CIPHER Ns s ,
+client and server certificates, keys, etc.
.It Vt SSL No (SSL Connection)
That's the main SSL/TLS structure which is created by a server or client per
established connection.
@@ -259,7 +260,6 @@ Use by other objects:
.Xr SSL_CTX_add_session 3 ,
.Xr SSL_set_session 3 ,
.Xr SSL_get_session 3
-.El
.Ss Connections
The following pages describe functions acting on
.Vt SSL