summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libssl/src')
-rw-r--r--lib/libssl/src/doc/crypto/DH_set_method.pod4
-rw-r--r--lib/libssl/src/doc/crypto/DSA_set_method.pod4
-rw-r--r--lib/libssl/src/doc/crypto/EVP_DigestInit.pod2
-rw-r--r--lib/libssl/src/doc/crypto/EVP_EncryptInit.pod4
-rw-r--r--lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod2
-rw-r--r--lib/libssl/src/doc/crypto/EVP_SignInit.pod3
-rw-r--r--lib/libssl/src/doc/crypto/RSA_set_method.pod3
-rw-r--r--lib/libssl/src/doc/crypto/bn_internal.pod4
-rw-r--r--lib/libssl/src/doc/crypto/ecdsa.pod7
-rw-r--r--lib/libssl/src/doc/crypto/engine.pod5
-rw-r--r--lib/libssl/src/doc/ssl/BIO_f_ssl.37
-rw-r--r--lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.38
-rw-r--r--lib/libssl/src/doc/ssl/SSL_SESSION_get_time.310
-rw-r--r--lib/libssl/src/doc/ssl/SSL_set_connect_state.36
-rw-r--r--lib/libssl/src/doc/ssl/ssl.36
15 files changed, 48 insertions, 27 deletions
diff --git a/lib/libssl/src/doc/crypto/DH_set_method.pod b/lib/libssl/src/doc/crypto/DH_set_method.pod
index d5cdc3be0ce..2a4c2735cb7 100644
--- a/lib/libssl/src/doc/crypto/DH_set_method.pod
+++ b/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/lib/libssl/src/doc/crypto/DSA_set_method.pod b/lib/libssl/src/doc/crypto/DSA_set_method.pod
index 707370adf76..31f444d7512 100644
--- a/lib/libssl/src/doc/crypto/DSA_set_method.pod
+++ b/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/lib/libssl/src/doc/crypto/EVP_DigestInit.pod b/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
index f6a1a55a24a..c83dcc736fe 100644
--- a/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
+++ b/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/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod b/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod
index e9254de3d26..02d02ba5f57 100644
--- a/lib/libssl/src/doc/crypto/EVP_EncryptInit.pod
+++ b/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/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod b/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod
index 463c44170e4..adcf3560e0a 100644
--- a/lib/libssl/src/doc/crypto/EVP_PKEY_keygen.pod
+++ b/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/lib/libssl/src/doc/crypto/EVP_SignInit.pod b/lib/libssl/src/doc/crypto/EVP_SignInit.pod
index 9aafa3d63aa..6882211e024 100644
--- a/lib/libssl/src/doc/crypto/EVP_SignInit.pod
+++ b/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/lib/libssl/src/doc/crypto/RSA_set_method.pod b/lib/libssl/src/doc/crypto/RSA_set_method.pod
index eb0913c1060..7f687c87189 100644
--- a/lib/libssl/src/doc/crypto/RSA_set_method.pod
+++ b/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/lib/libssl/src/doc/crypto/bn_internal.pod b/lib/libssl/src/doc/crypto/bn_internal.pod
index 7d4dac9ccf6..9c59ed623b4 100644
--- a/lib/libssl/src/doc/crypto/bn_internal.pod
+++ b/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/lib/libssl/src/doc/crypto/ecdsa.pod b/lib/libssl/src/doc/crypto/ecdsa.pod
index 9c8d633fc9c..9e9608155a7 100644
--- a/lib/libssl/src/doc/crypto/ecdsa.pod
+++ b/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/lib/libssl/src/doc/crypto/engine.pod b/lib/libssl/src/doc/crypto/engine.pod
index e305a732712..31035af398a 100644
--- a/lib/libssl/src/doc/crypto/engine.pod
+++ b/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/lib/libssl/src/doc/ssl/BIO_f_ssl.3 b/lib/libssl/src/doc/ssl/BIO_f_ssl.3
index 876018a8399..f70b6c1e235 100644
--- a/lib/libssl/src/doc/ssl/BIO_f_ssl.3
+++ b/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/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3 b/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
index 6589306fd47..c72f37ccd9e 100644
--- a/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
+++ b/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/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3 b/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
index 5eb7e5a1628..e906b5ad67f 100644
--- a/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
+++ b/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/lib/libssl/src/doc/ssl/SSL_set_connect_state.3 b/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
index e3f946f8ee3..291d9ac177b 100644
--- a/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
+++ b/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/lib/libssl/src/doc/ssl/ssl.3 b/lib/libssl/src/doc/ssl/ssl.3
index 7d61abb05c6..7a76403bdc8 100644
--- a/lib/libssl/src/doc/ssl/ssl.3
+++ b/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