5 files changed, 21 insertions, 16 deletions

diff --git a/src/lib/libssl/doc/BIO_f_ssl.3 b/src/lib/libssl/doc/BIO_f_ssl.3
index 876018a839..f70b6c1e23 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.3 2015/06/18 22:51:05 doug Exp $
+.\"     $OpenBSD: BIO_f_ssl.3,v 1.4 2015/11/11 22:14:40 jmc Exp $
 .\"
-.Dd $Mdocdate: June 18 2015 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt BIO_F_SSL 3
 .Os
 .Sh NAME
@@ -16,7 +16,8 @@
 .Nm BIO_new_ssl_connect ,
 .Nm BIO_new_buffer_ssl_connect ,
 .Nm BIO_ssl_copy_session_id ,
-.Nm BIO_ssl_shutdown
+.Nm BIO_ssl_shutdown ,
+.Nm BIO_do_handshake
 .Nd SSL BIO
 .Sh SYNOPSIS
 .In openssl/bio.h
diff --git a/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3
index 6589306fd4..c72f37ccd9 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3
@@ -1,14 +1,14 @@
 .\"
-.\"     $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"     $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
 .\"
-.Dd $Mdocdate: December 2 2014 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt SSL_CTX_SET_MSG_CALLBACK 3
 .Os
 .Sh NAME
 .Nm SSL_CTX_set_msg_callback ,
 .Nm SSL_CTX_set_msg_callback_arg ,
 .Nm SSL_set_msg_callback ,
-.Nm SSL_get_msg_callback_arg
+.Nm SSL_set_msg_callback_arg
 .Nd install callback for observing protocol messages
 .Sh SYNOPSIS
 .In openssl/ssl.h
@@ -131,5 +131,5 @@ will be
 .Fn SSL_CTX_set_msg_callback_arg ,
 .Fn SSL_set_msg_callback
 and
-.Fn SSL_get_msg_callback_arg
+.Fn SSL_set_msg_callback_arg
 were added in OpenSSL 0.9.7.
diff --git a/src/lib/libssl/doc/SSL_SESSION_get_time.3 b/src/lib/libssl/doc/SSL_SESSION_get_time.3
index 5eb7e5a162..e906b5ad67 100644
--- a/src/lib/libssl/doc/SSL_SESSION_get_time.3
+++ b/src/lib/libssl/doc/SSL_SESSION_get_time.3
@@ -1,14 +1,18 @@
 .\"
-.\"     $OpenBSD: SSL_SESSION_get_time.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"     $OpenBSD: SSL_SESSION_get_time.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
 .\"
-.Dd $Mdocdate: December 2 2014 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt SSL_SESSION_GET_TIME 3
 .Os
 .Sh NAME
 .Nm SSL_SESSION_get_time ,
 .Nm SSL_SESSION_set_time ,
 .Nm SSL_SESSION_get_timeout ,
-.Nm  SSL_SESSION_set_timeout
+.Nm SSL_SESSION_set_timeout ,
+.Nm SSL_get_time ,
+.Nm SSL_set_time ,
+.Nm SSL_get_timeout ,
+.Nm SSL_set_timeout
 .Nd retrieve and manipulate session time and timeout settings
 .Sh SYNOPSIS
 .In openssl/ssl.h
diff --git a/src/lib/libssl/doc/SSL_set_connect_state.3 b/src/lib/libssl/doc/SSL_set_connect_state.3
index e3f946f8ee..291d9ac177 100644
--- a/src/lib/libssl/doc/SSL_set_connect_state.3
+++ b/src/lib/libssl/doc/SSL_set_connect_state.3
@@ -1,12 +1,12 @@
 .\"
-.\"     $OpenBSD: SSL_set_connect_state.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"     $OpenBSD: SSL_set_connect_state.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
 .\"
-.Dd $Mdocdate: December 2 2014 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt SSL_SET_CONNECT_STATE 3
 .Os
 .Sh NAME
 .Nm SSL_set_connect_state ,
-.Nm SSL_get_accept_state
+.Nm SSL_set_accept_state
 .Nd prepare SSL object to work in client or server mode
 .Sh SYNOPSIS
 .In openssl/ssl.h
diff --git a/src/lib/libssl/doc/ssl.3 b/src/lib/libssl/doc/ssl.3
index 7d61abb05c..7a76403bdc 100644
--- a/src/lib/libssl/doc/ssl.3
+++ b/src/lib/libssl/doc/ssl.3
@@ -1,11 +1,11 @@
 .\"
-.\"     $OpenBSD: ssl.3,v 1.3 2015/09/10 18:04:50 schwarze Exp $
+.\"     $OpenBSD: ssl.3,v 1.4 2015/11/11 22:14:40 jmc Exp $
 .\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt SSL 3
 .Os
 .Sh NAME
-.Nm SSL
+.Nm ssl
 .Nd OpenSSL SSL/TLS library
 .Sh DESCRIPTION
 The OpenSSL