From 3681e43b7101c2171779b147addaa726f1373b2b Mon Sep 17 00:00:00 2001 From: jmc <> Date: Wed, 11 Nov 2015 22:14:40 +0000 Subject: add missing functions to NAME, or otherwise correct the mlink entry for them; feedback/ok schwarze --- src/lib/libcrypto/doc/DH_set_method.pod | 4 +++- src/lib/libcrypto/doc/DSA_set_method.pod | 4 +++- src/lib/libcrypto/doc/EVP_DigestInit.pod | 2 +- src/lib/libcrypto/doc/EVP_EncryptInit.pod | 4 +++- src/lib/libcrypto/doc/EVP_PKEY_keygen.pod | 2 +- src/lib/libcrypto/doc/EVP_SignInit.pod | 3 ++- src/lib/libcrypto/doc/RSA_set_method.pod | 3 ++- src/lib/libcrypto/doc/engine.pod | 5 ++++- src/lib/libcrypto/man/BIO_f_buffer.3 | 11 +++++++++-- src/lib/libcrypto/man/Makefile | 5 ++--- src/lib/libssl/doc/BIO_f_ssl.3 | 7 ++++--- src/lib/libssl/doc/SSL_CTX_set_msg_callback.3 | 8 ++++---- src/lib/libssl/doc/SSL_SESSION_get_time.3 | 10 +++++++--- src/lib/libssl/doc/SSL_set_connect_state.3 | 6 +++--- src/lib/libssl/doc/ssl.3 | 6 +++--- src/lib/libssl/src/doc/crypto/DH_set_method.pod | 4 +++- src/lib/libssl/src/doc/crypto/DSA_set_method.pod | 4 +++- src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod | 2 +- src/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod | 4 +++- src/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod | 2 +- src/lib/libssl/src/doc/crypto/EVP_SignInit.pod | 3 ++- src/lib/libssl/src/doc/crypto/RSA_set_method.pod | 3 ++- src/lib/libssl/src/doc/crypto/bn_internal.pod | 4 ++-- src/lib/libssl/src/doc/crypto/ecdsa.pod | 7 ++++++- src/lib/libssl/src/doc/crypto/engine.pod | 5 ++++- src/lib/libssl/src/doc/ssl/BIO_f_ssl.3 | 7 ++++--- src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3 | 8 ++++---- src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3 | 10 +++++++--- src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3 | 6 +++--- src/lib/libssl/src/doc/ssl/ssl.3 | 6 +++--- 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 @@ =head1 NAME DH_set_default_method, DH_get_default_method, -DH_set_method, DH_new_method, DH_OpenSSL - select DH method +DH_set_method, DH_new_method, DH_OpenSSL, +DH_set_default_openssl_method, DH_get_default_openssl_method +- select DH method =head1 SYNOPSIS 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 @@ =head1 NAME DSA_set_default_method, DSA_get_default_method, -DSA_set_method, DSA_new_method, DSA_OpenSSL - select DSA method +DSA_set_method, DSA_new_method, DSA_OpenSSL, +DSA_set_default_openssl_method, DSA_get_default_openssl_method +- select DSA method =head1 SYNOPSIS 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, EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, -EVP_get_digestbyobj - EVP digest routines +EVP_get_digestbyobj, EVP_DigestInit, EVP_DigestFinal - EVP digest routines =head1 SYNOPSIS 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, EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc, EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm, -EVP_aes_192_ccm, EVP_aes_256_ccm - EVP cipher routines +EVP_aes_192_ccm, EVP_aes_256_ccm, EVP_rc5_32_12_16_cbc, +EVP_rc5_32_12_16_cfb, EVP_rc5_32_12_16_ecb, EVP_rc5_32_12_16_ofb +- EVP cipher routines =head1 SYNOPSIS 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 @@ EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init, EVP_PKEY_paramgen, EVP_PKEY_CTX_set_cb, EVP_PKEY_CTX_get_cb, -EVP_PKEY_CTX_get_keygen_info, EVP_PKEVP_PKEY_CTX_set_app_data, +EVP_PKEY_CTX_get_keygen_info, EVP_PKEY_CTX_set_app_data, EVP_PKEY_CTX_get_app_data - key and parameter generation functions =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 @@ =head1 NAME -EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions +EVP_SignInit, EVP_SignUpdate, EVP_SignFinal, EVP_PKEY_size +- EVP signing functions =head1 SYNOPSIS 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 @@ RSA_set_default_method, RSA_get_default_method, RSA_set_method, RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags, -RSA_new_method - select RSA method +RSA_new_method, RSA_get_default_openssl_method, +RSA_set_default_openssl_method - select RSA method =head1 SYNOPSIS 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 @@ =head1 NAME -engine - ENGINE cryptographic module support +ENGINE_add, ENGINE_by_id, ENGINE_finish, ENGINE_get_first, +ENGINE_get_last, ENGINE_get_next, ENGINE_get_prev, +ENGINE_init, ENGINE_load_builtin_engines, ENGINE_remove +- ENGINE cryptographic module support =head1 SYNOPSIS 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 @@ -.Dd $Mdocdate: September 9 2015 $ +.\" $OpenBSD: BIO_f_buffer.3,v 1.3 2015/11/11 22:14:39 jmc Exp $ +.\" +.Dd $Mdocdate: November 11 2015 $ .Dt BIO_F_BUFFER 3 .Os .Sh NAME -.Nm BIO_f_buffer +.Nm BIO_f_buffer , +.Nm BIO_get_buffer_num_lines , +.Nm BIO_set_read_buffer_size , +.Nm BIO_set_write_buffer_size , +.Nm BIO_set_buffer_size , +.Nm BIO_set_buffer_read_data .Nd buffering BIO .Sh SYNOPSIS .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 @@ -# $OpenBSD: Makefile,v 1.27 2015/11/11 21:15:15 schwarze Exp $ +# $OpenBSD: Makefile,v 1.28 2015/11/11 22:14:39 jmc Exp $ .include # for NOMAN @@ -741,7 +741,7 @@ MLINKS+=\ EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_pss_saltlen.3 \ EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3 \ EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_signature_md.3 \ - EVP_PKEY_CTX_ctrl.3 EVP_PKEY_ctrl_str.3 \ + EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_ctrl_str.3 \ EVP_PKEY_CTX_ctrl.3 EVP_PKEY_get_default_digest_nid.3 \ EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_new_id.3 \ EVP_PKEY_CTX_new.3 EVP_PKEY_CTX_dup.3 \ @@ -927,7 +927,6 @@ MLINKS+=\ RSA_print.3 RSA_print_fp.3 \ RSA_private_encrypt.3 RSA_public_decrypt.3 \ RSA_public_encrypt.3 RSA_private_decrypt.3 \ - RSA_set_method.3 RSA_PKCS1_RSAref.3 \ RSA_set_method.3 RSA_PKCS1_SSLeay.3 \ RSA_set_method.3 RSA_flags.3 \ 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 @@ .\" -.\" $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 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 @@ =head1 NAME DH_set_default_method, DH_get_default_method, -DH_set_method, DH_new_method, DH_OpenSSL - select DH method +DH_set_method, DH_new_method, DH_OpenSSL, +DH_set_default_openssl_method, DH_get_default_openssl_method +- select DH method =head1 SYNOPSIS 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 @@ =head1 NAME DSA_set_default_method, DSA_get_default_method, -DSA_set_method, DSA_new_method, DSA_OpenSSL - select DSA method +DSA_set_method, DSA_new_method, DSA_OpenSSL, +DSA_set_default_openssl_method, DSA_get_default_openssl_method +- select DSA method =head1 SYNOPSIS 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, EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1, EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, -EVP_get_digestbyobj - EVP digest routines +EVP_get_digestbyobj, EVP_DigestInit, EVP_DigestFinal - EVP digest routines =head1 SYNOPSIS 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, EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc, EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm, -EVP_aes_192_ccm, EVP_aes_256_ccm - EVP cipher routines +EVP_aes_192_ccm, EVP_aes_256_ccm, EVP_rc5_32_12_16_cbc, +EVP_rc5_32_12_16_cfb, EVP_rc5_32_12_16_ecb, EVP_rc5_32_12_16_ofb +- EVP cipher routines =head1 SYNOPSIS 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 @@ EVP_PKEY_keygen_init, EVP_PKEY_keygen, EVP_PKEY_paramgen_init, EVP_PKEY_paramgen, EVP_PKEY_CTX_set_cb, EVP_PKEY_CTX_get_cb, -EVP_PKEY_CTX_get_keygen_info, EVP_PKEVP_PKEY_CTX_set_app_data, +EVP_PKEY_CTX_get_keygen_info, EVP_PKEY_CTX_set_app_data, EVP_PKEY_CTX_get_app_data - key and parameter generation functions =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 @@ =head1 NAME -EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions +EVP_SignInit, EVP_SignUpdate, EVP_SignFinal, EVP_PKEY_size +- EVP signing functions =head1 SYNOPSIS 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 @@ RSA_set_default_method, RSA_get_default_method, RSA_set_method, RSA_get_method, RSA_PKCS1_SSLeay, RSA_null_method, RSA_flags, -RSA_new_method - select RSA method +RSA_new_method, RSA_get_default_openssl_method, +RSA_set_default_openssl_method - select RSA method =head1 SYNOPSIS 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, bn_mul_low_normal, bn_mul_recursive, bn_mul_part_recursive, bn_mul_low_recursive, bn_mul_high, bn_sqr_normal, bn_sqr_recursive, bn_expand, bn_wexpand, bn_expand2, bn_fix_top, bn_check_top, -bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM -library internal functions +bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low, sqr +- BIGNUM library internal functions =head1 SYNOPSIS 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 @@ =head1 NAME -ECDSA_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 +ECDSA_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, +ECDSA_OpenSSL, ECDSA_get_default_method, ECDSA_get_ex_data, +ECDSA_get_ex_new_index, ECDSA_set_default_method, ECDSA_set_ex_data, +ECDSA_set_method - Elliptic Curve Digital Signature Algorithm =head1 SYNOPSIS 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 @@ =head1 NAME -engine - ENGINE cryptographic module support +ENGINE_add, ENGINE_by_id, ENGINE_finish, ENGINE_get_first, +ENGINE_get_last, ENGINE_get_next, ENGINE_get_prev, +ENGINE_init, ENGINE_load_builtin_engines, ENGINE_remove +- ENGINE cryptographic module support =head1 SYNOPSIS 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 @@ .\" -.\" $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/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 @@ .\" -.\" $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/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 @@ .\" -.\" $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/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 @@ .\" -.\" $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/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 @@ .\" -.\" $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 -- cgit v1.2.3-55-g6feb