summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2015-11-11 22:14:40 +0000
committerjmc <>2015-11-11 22:14:40 +0000
commit3681e43b7101c2171779b147addaa726f1373b2b (patch)
tree145dacabb23df6062e88c39d885cb2c0c9c9bc77
parent22f89c8c27130dce389c2cba215b4cdd0deadd22 (diff)
downloadopenbsd-3681e43b7101c2171779b147addaa726f1373b2b.tar.gz
openbsd-3681e43b7101c2171779b147addaa726f1373b2b.tar.bz2
openbsd-3681e43b7101c2171779b147addaa726f1373b2b.zip
add missing functions to NAME, or otherwise correct the mlink
entry for them; feedback/ok schwarze
-rw-r--r--src/lib/libcrypto/doc/DH_set_method.pod4
-rw-r--r--src/lib/libcrypto/doc/DSA_set_method.pod4
-rw-r--r--src/lib/libcrypto/doc/EVP_DigestInit.pod2
-rw-r--r--src/lib/libcrypto/doc/EVP_EncryptInit.pod4
-rw-r--r--src/lib/libcrypto/doc/EVP_PKEY_keygen.pod2
-rw-r--r--src/lib/libcrypto/doc/EVP_SignInit.pod3
-rw-r--r--src/lib/libcrypto/doc/RSA_set_method.pod3
-rw-r--r--src/lib/libcrypto/doc/engine.pod5
-rw-r--r--src/lib/libcrypto/man/BIO_f_buffer.311
-rw-r--r--src/lib/libcrypto/man/Makefile5
-rw-r--r--src/lib/libssl/doc/BIO_f_ssl.37
-rw-r--r--src/lib/libssl/doc/SSL_CTX_set_msg_callback.38
-rw-r--r--src/lib/libssl/doc/SSL_SESSION_get_time.310
-rw-r--r--src/lib/libssl/doc/SSL_set_connect_state.36
-rw-r--r--src/lib/libssl/doc/ssl.36
-rw-r--r--src/lib/libssl/src/doc/crypto/DH_set_method.pod4
-rw-r--r--src/lib/libssl/src/doc/crypto/DSA_set_method.pod4
-rw-r--r--src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod2
-rw-r--r--src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod4
-rw-r--r--src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod2
-rw-r--r--src/lib/libssl/src/doc/crypto/EVP_SignInit.pod3
-rw-r--r--src/lib/libssl/src/doc/crypto/RSA_set_method.pod3
-rw-r--r--src/lib/libssl/src/doc/crypto/bn_internal.pod4
-rw-r--r--src/lib/libssl/src/doc/crypto/ecdsa.pod7
-rw-r--r--src/lib/libssl/src/doc/crypto/engine.pod5
-rw-r--r--src/lib/libssl/src/doc/ssl/BIO_f_ssl.37
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.38
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.310
-rw-r--r--src/lib/libssl/src/doc/ssl/SSL_set_connect_state.36
-rw-r--r--src/lib/libssl/src/doc/ssl/ssl.36
30 files changed, 99 insertions, 56 deletions
diff --git a/src/lib/libcrypto/doc/DH_set_method.pod b/src/lib/libcrypto/doc/DH_set_method.pod
index d5cdc3be0c..2a4c2735cb 100644
--- a/src/lib/libcrypto/doc/DH_set_method.pod
+++ b/src/lib/libcrypto/doc/DH_set_method.pod
@@ -3,7 +3,9 @@
3=head1 NAME 3=head1 NAME
4 4
5DH_set_default_method, DH_get_default_method, 5DH_set_default_method, DH_get_default_method,
6DH_set_method, DH_new_method, DH_OpenSSL - select DH method 6DH_set_method, DH_new_method, DH_OpenSSL,
7DH_set_default_openssl_method, DH_get_default_openssl_method
8- select DH method
7 9
8=head1 SYNOPSIS 10=head1 SYNOPSIS
9 11
diff --git a/src/lib/libcrypto/doc/DSA_set_method.pod b/src/lib/libcrypto/doc/DSA_set_method.pod
index 707370adf7..31f444d751 100644
--- a/src/lib/libcrypto/doc/DSA_set_method.pod
+++ b/src/lib/libcrypto/doc/DSA_set_method.pod
@@ -3,7 +3,9 @@
3=head1 NAME 3=head1 NAME
4 4
5DSA_set_default_method, DSA_get_default_method, 5DSA_set_default_method, DSA_get_default_method,
6DSA_set_method, DSA_new_method, DSA_OpenSSL - select DSA method 6DSA_set_method, DSA_new_method, DSA_OpenSSL,
7DSA_set_default_openssl_method, DSA_get_default_openssl_method
8- select DSA method
7 9
8=head1 SYNOPSIS 10=head1 SYNOPSIS
9 11
diff --git a/src/lib/libcrypto/doc/EVP_DigestInit.pod b/src/lib/libcrypto/doc/EVP_DigestInit.pod
index f6a1a55a24..c83dcc736f 100644
--- a/src/lib/libcrypto/doc/EVP_DigestInit.pod
+++ b/src/lib/libcrypto/doc/EVP_DigestInit.pod
@@ -9,7 +9,7 @@ EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size,
9EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, 9EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5,
10EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, 10EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1,
11EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, 11EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid,
12EVP_get_digestbyobj - EVP digest routines 12EVP_get_digestbyobj, EVP_DigestInit, EVP_DigestFinal - EVP digest routines
13 13
14=head1 SYNOPSIS 14=head1 SYNOPSIS
15 15
diff --git a/src/lib/libcrypto/doc/EVP_EncryptInit.pod b/src/lib/libcrypto/doc/EVP_EncryptInit.pod
index e9254de3d2..02d02ba5f5 100644
--- a/src/lib/libcrypto/doc/EVP_EncryptInit.pod
+++ b/src/lib/libcrypto/doc/EVP_EncryptInit.pod
@@ -25,7 +25,9 @@ EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc,
25EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc, 25EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc,
26EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, 26EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb,
27EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm, 27EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm,
28EVP_aes_192_ccm, EVP_aes_256_ccm - EVP cipher routines 28EVP_aes_192_ccm, EVP_aes_256_ccm, EVP_rc5_32_12_16_cbc,
29EVP_rc5_32_12_16_cfb, EVP_rc5_32_12_16_ecb, EVP_rc5_32_12_16_ofb
30- EVP cipher routines
29 31
30=head1 SYNOPSIS 32=head1 SYNOPSIS
31 33
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod b/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod
index 463c44170e..adcf3560e0 100644
--- a/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod
+++ b/src/lib/libcrypto/doc/EVP_PKEY_keygen.pod
@@ -4,7 +4,7 @@
4 4
5EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init, 5EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init,
6EVP_PKEY_paramgen, EVP_PKEY_CTX_set_cb, EVP_PKEY_CTX_get_cb, 6EVP_PKEY_paramgen, EVP_PKEY_CTX_set_cb, EVP_PKEY_CTX_get_cb,
7EVP_PKEY_CTX_get_keygen_info, EVP_PKEVP_PKEY_CTX_set_app_data, 7EVP_PKEY_CTX_get_keygen_info, EVP_PKEY_CTX_set_app_data,
8EVP_PKEY_CTX_get_app_data - key and parameter generation functions 8EVP_PKEY_CTX_get_app_data - key and parameter generation functions
9 9
10=head1 SYNOPSIS 10=head1 SYNOPSIS
diff --git a/src/lib/libcrypto/doc/EVP_SignInit.pod b/src/lib/libcrypto/doc/EVP_SignInit.pod
index 9aafa3d63a..6882211e02 100644
--- a/src/lib/libcrypto/doc/EVP_SignInit.pod
+++ b/src/lib/libcrypto/doc/EVP_SignInit.pod
@@ -2,7 +2,8 @@
2 2
3=head1 NAME 3=head1 NAME
4 4
5EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions 5EVP_SignInit, EVP_SignUpdate, EVP_SignFinal, EVP_PKEY_size
6- EVP signing functions
6 7
7=head1 SYNOPSIS 8=head1 SYNOPSIS
8 9
diff --git a/src/lib/libcrypto/doc/RSA_set_method.pod b/src/lib/libcrypto/doc/RSA_set_method.pod
index eb0913c106..7f687c8718 100644
--- a/src/lib/libcrypto/doc/RSA_set_method.pod
+++ b/src/lib/libcrypto/doc/RSA_set_method.pod
@@ -4,7 +4,8 @@
4 4
5RSA_set_default_method, RSA_get_default_method, RSA_set_method, 5RSA_set_default_method, RSA_get_default_method, RSA_set_method,
6RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags, 6RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags,
7RSA_new_method - select RSA method 7RSA_new_method, RSA_get_default_openssl_method,
8RSA_set_default_openssl_method - select RSA method
8 9
9=head1 SYNOPSIS 10=head1 SYNOPSIS
10 11
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index e305a73271..31035af398 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -2,7 +2,10 @@
2 2
3=head1 NAME 3=head1 NAME
4 4
5engine - ENGINE cryptographic module support 5ENGINE_add, ENGINE_by_id, ENGINE_finish, ENGINE_get_first,
6ENGINE_get_last, ENGINE_get_next, ENGINE_get_prev,
7ENGINE_init, ENGINE_load_builtin_engines, ENGINE_remove
8- ENGINE cryptographic module support
6 9
7=head1 SYNOPSIS 10=head1 SYNOPSIS
8 11
diff --git a/src/lib/libcrypto/man/BIO_f_buffer.3 b/src/lib/libcrypto/man/BIO_f_buffer.3
index a2629535c5..785934d553 100644
--- a/src/lib/libcrypto/man/BIO_f_buffer.3
+++ b/src/lib/libcrypto/man/BIO_f_buffer.3
@@ -1,8 +1,15 @@
1.Dd $Mdocdate: September 9 2015 $ 1.\" $OpenBSD: BIO_f_buffer.3,v 1.3 2015/11/11 22:14:39 jmc Exp $
2.\"
3.Dd $Mdocdate: November 11 2015 $
2.Dt BIO_F_BUFFER 3 4.Dt BIO_F_BUFFER 3
3.Os 5.Os
4.Sh NAME 6.Sh NAME
5.Nm BIO_f_buffer 7.Nm BIO_f_buffer ,
8.Nm BIO_get_buffer_num_lines ,
9.Nm BIO_set_read_buffer_size ,
10.Nm BIO_set_write_buffer_size ,
11.Nm BIO_set_buffer_size ,
12.Nm BIO_set_buffer_read_data
6.Nd buffering BIO 13.Nd buffering BIO
7.Sh SYNOPSIS 14.Sh SYNOPSIS
8.In openssl/bio.h 15.In openssl/bio.h
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index ef5c1f9727..ecb1d51a52 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.27 2015/11/11 21:15:15 schwarze Exp $ 1# $OpenBSD: Makefile,v 1.28 2015/11/11 22:14:39 jmc Exp $
2 2
3.include <bsd.own.mk> # for NOMAN 3.include <bsd.own.mk> # for NOMAN
4 4
@@ -741,7 +741,7 @@ MLINKS+=\
741 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_pss_saltlen.3 \ 741 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_pss_saltlen.3 \
742 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3 \ 742 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3 \
743 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_signature_md.3 \ 743 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_signature_md.3 \
744 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_ctrl_str.3 \ 744 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_ctrl_str.3 \
745 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_get_default_digest_nid.3 \ 745 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_get_default_digest_nid.3 \
746 EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_new_id.3 \ 746 EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_new_id.3 \
747 EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_dup.3 \ 747 EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_dup.3 \
@@ -927,7 +927,6 @@ MLINKS+=\
927 RSA_print.3 RSA_print_fp.3 \ 927 RSA_print.3 RSA_print_fp.3 \
928 RSA_private_encrypt.3 RSA_public_decrypt.3 \ 928 RSA_private_encrypt.3 RSA_public_decrypt.3 \
929 RSA_public_encrypt.3 RSA_private_decrypt.3 \ 929 RSA_public_encrypt.3 RSA_private_decrypt.3 \
930 RSA_set_method.3 RSA_PKCS1_RSAref.3 \
931 RSA_set_method.3 RSA_PKCS1_SSLeay.3 \ 930 RSA_set_method.3 RSA_PKCS1_SSLeay.3 \
932 RSA_set_method.3 RSA_flags.3 \ 931 RSA_set_method.3 RSA_flags.3 \
933 RSA_set_method.3 RSA_get_default_method.3 \ 932 RSA_set_method.3 RSA_get_default_method.3 \
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 @@
1.\" 1.\"
2.\" $OpenBSD: BIO_f_ssl.3,v 1.3 2015/06/18 22:51:05 doug Exp $ 2.\" $OpenBSD: BIO_f_ssl.3,v 1.4 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: June 18 2015 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt BIO_F_SSL 3 5.Dt BIO_F_SSL 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
@@ -16,7 +16,8 @@
16.Nm BIO_new_ssl_connect , 16.Nm BIO_new_ssl_connect ,
17.Nm BIO_new_buffer_ssl_connect , 17.Nm BIO_new_buffer_ssl_connect ,
18.Nm BIO_ssl_copy_session_id , 18.Nm BIO_ssl_copy_session_id ,
19.Nm BIO_ssl_shutdown 19.Nm BIO_ssl_shutdown ,
20.Nm BIO_do_handshake
20.Nd SSL BIO 21.Nd SSL BIO
21.Sh SYNOPSIS 22.Sh SYNOPSIS
22.In openssl/bio.h 23.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 @@
1.\" 1.\"
2.\" $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ 2.\" $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: December 2 2014 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL_CTX_SET_MSG_CALLBACK 3 5.Dt SSL_CTX_SET_MSG_CALLBACK 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL_CTX_set_msg_callback , 8.Nm SSL_CTX_set_msg_callback ,
9.Nm SSL_CTX_set_msg_callback_arg , 9.Nm SSL_CTX_set_msg_callback_arg ,
10.Nm SSL_set_msg_callback , 10.Nm SSL_set_msg_callback ,
11.Nm SSL_get_msg_callback_arg 11.Nm SSL_set_msg_callback_arg
12.Nd install callback for observing protocol messages 12.Nd install callback for observing protocol messages
13.Sh SYNOPSIS 13.Sh SYNOPSIS
14.In openssl/ssl.h 14.In openssl/ssl.h
@@ -131,5 +131,5 @@ will be
131.Fn SSL_CTX_set_msg_callback_arg , 131.Fn SSL_CTX_set_msg_callback_arg ,
132.Fn SSL_set_msg_callback 132.Fn SSL_set_msg_callback
133and 133and
134.Fn SSL_get_msg_callback_arg 134.Fn SSL_set_msg_callback_arg
135were added in OpenSSL 0.9.7. 135were 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 @@
1.\" 1.\"
2.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ 2.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: December 2 2014 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL_SESSION_GET_TIME 3 5.Dt SSL_SESSION_GET_TIME 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL_SESSION_get_time , 8.Nm SSL_SESSION_get_time ,
9.Nm SSL_SESSION_set_time , 9.Nm SSL_SESSION_set_time ,
10.Nm SSL_SESSION_get_timeout , 10.Nm SSL_SESSION_get_timeout ,
11.Nm SSL_SESSION_set_timeout 11.Nm SSL_SESSION_set_timeout ,
12.Nm SSL_get_time ,
13.Nm SSL_set_time ,
14.Nm SSL_get_timeout ,
15.Nm SSL_set_timeout
12.Nd retrieve and manipulate session time and timeout settings 16.Nd retrieve and manipulate session time and timeout settings
13.Sh SYNOPSIS 17.Sh SYNOPSIS
14.In openssl/ssl.h 18.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 @@
1.\" 1.\"
2.\" $OpenBSD: SSL_set_connect_state.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ 2.\" $OpenBSD: SSL_set_connect_state.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: December 2 2014 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL_SET_CONNECT_STATE 3 5.Dt SSL_SET_CONNECT_STATE 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL_set_connect_state , 8.Nm SSL_set_connect_state ,
9.Nm SSL_get_accept_state 9.Nm SSL_set_accept_state
10.Nd prepare SSL object to work in client or server mode 10.Nd prepare SSL object to work in client or server mode
11.Sh SYNOPSIS 11.Sh SYNOPSIS
12.In openssl/ssl.h 12.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 @@
1.\" 1.\"
2.\" $OpenBSD: ssl.3,v 1.3 2015/09/10 18:04:50 schwarze Exp $ 2.\" $OpenBSD: ssl.3,v 1.4 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: September 10 2015 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL 3 5.Dt SSL 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL 8.Nm ssl
9.Nd OpenSSL SSL/TLS library 9.Nd OpenSSL SSL/TLS library
10.Sh DESCRIPTION 10.Sh DESCRIPTION
11The OpenSSL 11The OpenSSL
diff --git a/src/lib/libssl/src/doc/crypto/DH_set_method.pod b/src/lib/libssl/src/doc/crypto/DH_set_method.pod
index d5cdc3be0c..2a4c2735cb 100644
--- a/src/lib/libssl/src/doc/crypto/DH_set_method.pod
+++ b/src/lib/libssl/src/doc/crypto/DH_set_method.pod
@@ -3,7 +3,9 @@
3=head1 NAME 3=head1 NAME
4 4
5DH_set_default_method, DH_get_default_method, 5DH_set_default_method, DH_get_default_method,
6DH_set_method, DH_new_method, DH_OpenSSL - select DH method 6DH_set_method, DH_new_method, DH_OpenSSL,
7DH_set_default_openssl_method, DH_get_default_openssl_method
8- select DH method
7 9
8=head1 SYNOPSIS 10=head1 SYNOPSIS
9 11
diff --git a/src/lib/libssl/src/doc/crypto/DSA_set_method.pod b/src/lib/libssl/src/doc/crypto/DSA_set_method.pod
index 707370adf7..31f444d751 100644
--- a/src/lib/libssl/src/doc/crypto/DSA_set_method.pod
+++ b/src/lib/libssl/src/doc/crypto/DSA_set_method.pod
@@ -3,7 +3,9 @@
3=head1 NAME 3=head1 NAME
4 4
5DSA_set_default_method, DSA_get_default_method, 5DSA_set_default_method, DSA_get_default_method,
6DSA_set_method, DSA_new_method, DSA_OpenSSL - select DSA method 6DSA_set_method, DSA_new_method, DSA_OpenSSL,
7DSA_set_default_openssl_method, DSA_get_default_openssl_method
8- select DSA method
7 9
8=head1 SYNOPSIS 10=head1 SYNOPSIS
9 11
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
index f6a1a55a24..c83dcc736f 100644
--- a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
+++ b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
@@ -9,7 +9,7 @@ EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size,
9EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, 9EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5,
10EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, 10EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1,
11EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, 11EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid,
12EVP_get_digestbyobj - EVP digest routines 12EVP_get_digestbyobj, EVP_DigestInit, EVP_DigestFinal - EVP digest routines
13 13
14=head1 SYNOPSIS 14=head1 SYNOPSIS
15 15
diff --git a/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod b/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod
index e9254de3d2..02d02ba5f5 100644
--- a/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod
+++ b/src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod
@@ -25,7 +25,9 @@ EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc,
25EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc, 25EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc,
26EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, 26EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb,
27EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm, 27EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm,
28EVP_aes_192_ccm, EVP_aes_256_ccm - EVP cipher routines 28EVP_aes_192_ccm, EVP_aes_256_ccm, EVP_rc5_32_12_16_cbc,
29EVP_rc5_32_12_16_cfb, EVP_rc5_32_12_16_ecb, EVP_rc5_32_12_16_ofb
30- EVP cipher routines
29 31
30=head1 SYNOPSIS 32=head1 SYNOPSIS
31 33
diff --git a/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod b/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod
index 463c44170e..adcf3560e0 100644
--- a/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod
+++ b/src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod
@@ -4,7 +4,7 @@
4 4
5EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init, 5EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init,
6EVP_PKEY_paramgen, EVP_PKEY_CTX_set_cb, EVP_PKEY_CTX_get_cb, 6EVP_PKEY_paramgen, EVP_PKEY_CTX_set_cb, EVP_PKEY_CTX_get_cb,
7EVP_PKEY_CTX_get_keygen_info, EVP_PKEVP_PKEY_CTX_set_app_data, 7EVP_PKEY_CTX_get_keygen_info, EVP_PKEY_CTX_set_app_data,
8EVP_PKEY_CTX_get_app_data - key and parameter generation functions 8EVP_PKEY_CTX_get_app_data - key and parameter generation functions
9 9
10=head1 SYNOPSIS 10=head1 SYNOPSIS
diff --git a/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod b/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod
index 9aafa3d63a..6882211e02 100644
--- a/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod
+++ b/src/lib/libssl/src/doc/crypto/EVP_SignInit.pod
@@ -2,7 +2,8 @@
2 2
3=head1 NAME 3=head1 NAME
4 4
5EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions 5EVP_SignInit, EVP_SignUpdate, EVP_SignFinal, EVP_PKEY_size
6- EVP signing functions
6 7
7=head1 SYNOPSIS 8=head1 SYNOPSIS
8 9
diff --git a/src/lib/libssl/src/doc/crypto/RSA_set_method.pod b/src/lib/libssl/src/doc/crypto/RSA_set_method.pod
index eb0913c106..7f687c8718 100644
--- a/src/lib/libssl/src/doc/crypto/RSA_set_method.pod
+++ b/src/lib/libssl/src/doc/crypto/RSA_set_method.pod
@@ -4,7 +4,8 @@
4 4
5RSA_set_default_method, RSA_get_default_method, RSA_set_method, 5RSA_set_default_method, RSA_get_default_method, RSA_set_method,
6RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags, 6RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags,
7RSA_new_method - select RSA method 7RSA_new_method, RSA_get_default_openssl_method,
8RSA_set_default_openssl_method - select RSA method
8 9
9=head1 SYNOPSIS 10=head1 SYNOPSIS
10 11
diff --git a/src/lib/libssl/src/doc/crypto/bn_internal.pod b/src/lib/libssl/src/doc/crypto/bn_internal.pod
index 7d4dac9ccf..9c59ed623b 100644
--- a/src/lib/libssl/src/doc/crypto/bn_internal.pod
+++ b/src/lib/libssl/src/doc/crypto/bn_internal.pod
@@ -8,8 +8,8 @@ bn_sqr_comba4, bn_sqr_comba8, bn_cmp_words, bn_mul_normal,
8bn_mul_low_normal, bn_mul_recursive, bn_mul_part_recursive, 8bn_mul_low_normal, bn_mul_recursive, bn_mul_part_recursive,
9bn_mul_low_recursive, bn_mul_high, bn_sqr_normal, bn_sqr_recursive, 9bn_mul_low_recursive, bn_mul_high, bn_sqr_normal, bn_sqr_recursive,
10bn_expand, bn_wexpand, bn_expand2, bn_fix_top, bn_check_top, 10bn_expand, bn_wexpand, bn_expand2, bn_fix_top, bn_check_top,
11bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM 11bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low, sqr
12library internal functions 12- BIGNUM library internal functions
13 13
14=head1 SYNOPSIS 14=head1 SYNOPSIS
15 15
diff --git a/src/lib/libssl/src/doc/crypto/ecdsa.pod b/src/lib/libssl/src/doc/crypto/ecdsa.pod
index 9c8d633fc9..9e9608155a 100644
--- a/src/lib/libssl/src/doc/crypto/ecdsa.pod
+++ b/src/lib/libssl/src/doc/crypto/ecdsa.pod
@@ -2,7 +2,12 @@
2 2
3=head1 NAME 3=head1 NAME
4 4
5ECDSA_SIG_new, ECDSA_SIG_free, i2d_ECDSA_SIG, d2i_ECDSA_SIG, ECDSA_size, ECDSA_sign_setup, ECDSA_sign, ECDSA_sign_ex, ECDSA_verify, ECDSA_do_sign, ECDSA_do_sign_ex, ECDSA_do_verify - Elliptic Curve Digital Signature Algorithm 5ECDSA_SIG_new, ECDSA_SIG_free, i2d_ECDSA_SIG, d2i_ECDSA_SIG,
6ECDSA_size, ECDSA_sign_setup, ECDSA_sign, ECDSA_sign_ex,
7ECDSA_verify, ECDSA_do_sign, ECDSA_do_sign_ex, ECDSA_do_verify,
8ECDSA_OpenSSL, ECDSA_get_default_method, ECDSA_get_ex_data,
9ECDSA_get_ex_new_index, ECDSA_set_default_method, ECDSA_set_ex_data,
10ECDSA_set_method - Elliptic Curve Digital Signature Algorithm
6 11
7=head1 SYNOPSIS 12=head1 SYNOPSIS
8 13
diff --git a/src/lib/libssl/src/doc/crypto/engine.pod b/src/lib/libssl/src/doc/crypto/engine.pod
index e305a73271..31035af398 100644
--- a/src/lib/libssl/src/doc/crypto/engine.pod
+++ b/src/lib/libssl/src/doc/crypto/engine.pod
@@ -2,7 +2,10 @@
2 2
3=head1 NAME 3=head1 NAME
4 4
5engine - ENGINE cryptographic module support 5ENGINE_add, ENGINE_by_id, ENGINE_finish, ENGINE_get_first,
6ENGINE_get_last, ENGINE_get_next, ENGINE_get_prev,
7ENGINE_init, ENGINE_load_builtin_engines, ENGINE_remove
8- ENGINE cryptographic module support
6 9
7=head1 SYNOPSIS 10=head1 SYNOPSIS
8 11
diff --git a/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3 b/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3
index 876018a839..f70b6c1e23 100644
--- a/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3
+++ b/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3
@@ -1,7 +1,7 @@
1.\" 1.\"
2.\" $OpenBSD: BIO_f_ssl.3,v 1.3 2015/06/18 22:51:05 doug Exp $ 2.\" $OpenBSD: BIO_f_ssl.3,v 1.4 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: June 18 2015 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt BIO_F_SSL 3 5.Dt BIO_F_SSL 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
@@ -16,7 +16,8 @@
16.Nm BIO_new_ssl_connect , 16.Nm BIO_new_ssl_connect ,
17.Nm BIO_new_buffer_ssl_connect , 17.Nm BIO_new_buffer_ssl_connect ,
18.Nm BIO_ssl_copy_session_id , 18.Nm BIO_ssl_copy_session_id ,
19.Nm BIO_ssl_shutdown 19.Nm BIO_ssl_shutdown ,
20.Nm BIO_do_handshake
20.Nd SSL BIO 21.Nd SSL BIO
21.Sh SYNOPSIS 22.Sh SYNOPSIS
22.In openssl/bio.h 23.In openssl/bio.h
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
index 6589306fd4..c72f37ccd9 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
@@ -1,14 +1,14 @@
1.\" 1.\"
2.\" $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ 2.\" $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: December 2 2014 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL_CTX_SET_MSG_CALLBACK 3 5.Dt SSL_CTX_SET_MSG_CALLBACK 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL_CTX_set_msg_callback , 8.Nm SSL_CTX_set_msg_callback ,
9.Nm SSL_CTX_set_msg_callback_arg , 9.Nm SSL_CTX_set_msg_callback_arg ,
10.Nm SSL_set_msg_callback , 10.Nm SSL_set_msg_callback ,
11.Nm SSL_get_msg_callback_arg 11.Nm SSL_set_msg_callback_arg
12.Nd install callback for observing protocol messages 12.Nd install callback for observing protocol messages
13.Sh SYNOPSIS 13.Sh SYNOPSIS
14.In openssl/ssl.h 14.In openssl/ssl.h
@@ -131,5 +131,5 @@ will be
131.Fn SSL_CTX_set_msg_callback_arg , 131.Fn SSL_CTX_set_msg_callback_arg ,
132.Fn SSL_set_msg_callback 132.Fn SSL_set_msg_callback
133and 133and
134.Fn SSL_get_msg_callback_arg 134.Fn SSL_set_msg_callback_arg
135were added in OpenSSL 0.9.7. 135were added in OpenSSL 0.9.7.
diff --git a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3 b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
index 5eb7e5a162..e906b5ad67 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
@@ -1,14 +1,18 @@
1.\" 1.\"
2.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ 2.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: December 2 2014 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL_SESSION_GET_TIME 3 5.Dt SSL_SESSION_GET_TIME 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL_SESSION_get_time , 8.Nm SSL_SESSION_get_time ,
9.Nm SSL_SESSION_set_time , 9.Nm SSL_SESSION_set_time ,
10.Nm SSL_SESSION_get_timeout , 10.Nm SSL_SESSION_get_timeout ,
11.Nm SSL_SESSION_set_timeout 11.Nm SSL_SESSION_set_timeout ,
12.Nm SSL_get_time ,
13.Nm SSL_set_time ,
14.Nm SSL_get_timeout ,
15.Nm SSL_set_timeout
12.Nd retrieve and manipulate session time and timeout settings 16.Nd retrieve and manipulate session time and timeout settings
13.Sh SYNOPSIS 17.Sh SYNOPSIS
14.In openssl/ssl.h 18.In openssl/ssl.h
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3 b/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
index e3f946f8ee..291d9ac177 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
@@ -1,12 +1,12 @@
1.\" 1.\"
2.\" $OpenBSD: SSL_set_connect_state.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ 2.\" $OpenBSD: SSL_set_connect_state.3,v 1.3 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: December 2 2014 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL_SET_CONNECT_STATE 3 5.Dt SSL_SET_CONNECT_STATE 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL_set_connect_state , 8.Nm SSL_set_connect_state ,
9.Nm SSL_get_accept_state 9.Nm SSL_set_accept_state
10.Nd prepare SSL object to work in client or server mode 10.Nd prepare SSL object to work in client or server mode
11.Sh SYNOPSIS 11.Sh SYNOPSIS
12.In openssl/ssl.h 12.In openssl/ssl.h
diff --git a/src/lib/libssl/src/doc/ssl/ssl.3 b/src/lib/libssl/src/doc/ssl/ssl.3
index 7d61abb05c..7a76403bdc 100644
--- a/src/lib/libssl/src/doc/ssl/ssl.3
+++ b/src/lib/libssl/src/doc/ssl/ssl.3
@@ -1,11 +1,11 @@
1.\" 1.\"
2.\" $OpenBSD: ssl.3,v 1.3 2015/09/10 18:04:50 schwarze Exp $ 2.\" $OpenBSD: ssl.3,v 1.4 2015/11/11 22:14:40 jmc Exp $
3.\" 3.\"
4.Dd $Mdocdate: September 10 2015 $ 4.Dd $Mdocdate: November 11 2015 $
5.Dt SSL 3 5.Dt SSL 3
6.Os 6.Os
7.Sh NAME 7.Sh NAME
8.Nm SSL 8.Nm ssl
9.Nd OpenSSL SSL/TLS library 9.Nd OpenSSL SSL/TLS library
10.Sh DESCRIPTION 10.Sh DESCRIPTION
11The OpenSSL 11The OpenSSL