summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/man/SSL_CTX_set_default_passwd_cb.36
-rw-r--r--src/lib/libssl/man/SSL_CTX_set_mode.312
2 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 b/src/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
index f4a2bde147..ff0773adb0 100644
--- a/src/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
+++ b/src/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: SSL_CTX_set_default_passwd_cb.3,v 1.4 2018/03/21 05:07:04 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_set_default_passwd_cb.3,v 1.5 2018/03/21 21:20:26 schwarze Exp $
2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 2.\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -137,3 +137,7 @@ int pem_passwd_cb(char *buf, int size, int rwflag, void *password)
137.Fn SSL_CTX_set_default_passwd_cb 137.Fn SSL_CTX_set_default_passwd_cb
138appeared before SSLeay 0.8 and has been available since 138appeared before SSLeay 0.8 and has been available since
139.Ox 2.4 . 139.Ox 2.4 .
140.Pp
141.Fn SSL_CTX_set_default_passwd_cb_userdata
142first appeared in OpenSSL 0.9.4 and has been available since
143.Ox 2.6 .
diff --git a/src/lib/libssl/man/SSL_CTX_set_mode.3 b/src/lib/libssl/man/SSL_CTX_set_mode.3
index 25a1117538..2d9e57f2da 100644
--- a/src/lib/libssl/man/SSL_CTX_set_mode.3
+++ b/src/lib/libssl/man/SSL_CTX_set_mode.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: SSL_CTX_set_mode.3,v 1.3 2017/04/10 14:00:51 schwarze Exp $ 1.\" $OpenBSD: SSL_CTX_set_mode.3,v 1.4 2018/03/21 21:20:26 schwarze Exp $
2.\" OpenSSL 8671b898 Jun 3 02:48:34 2008 +0000 2.\" OpenSSL 8671b898 Jun 3 02:48:34 2008 +0000
3.\" 3.\"
4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and 4.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: April 10 2017 $ 52.Dd $Mdocdate: March 21 2018 $
53.Dt SSL_CTX_SET_MODE 3 53.Dt SSL_CTX_SET_MODE 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -165,5 +165,13 @@ return the current bitmask.
165.Xr SSL_read 3 , 165.Xr SSL_read 3 ,
166.Xr SSL_write 3 166.Xr SSL_write 3
167.Sh HISTORY 167.Sh HISTORY
168.Fn SSL_CTX_set_mode ,
169.Fn SSL_set_mode ,
170.Fn SSL_CTX_get_mode ,
171and
172.Fn SSL_get_mode
173first appeared in OpenSSL 0.9.4 and have been available since
174.Ox 2.6 .
175.Pp
168.Dv SSL_MODE_AUTO_RETRY 176.Dv SSL_MODE_AUTO_RETRY
169was added in OpenSSL 0.9.6. 177was added in OpenSSL 0.9.6.