[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6556519ea0581323f2330684ad2ae81f0448ef52 (commit)
      from  44eb65ce20d673d0332802275d54f6811f448076 (commit)


- Log -----------------------------------------------------------------
commit 6556519ea0581323f2330684ad2ae81f0448ef52
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Mar 3 15:03:42 2017 -0500

    Remove some duplicate manpage entries
    
    [skip ci]
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2860)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/X509_STORE_set_verify_cb_func.pod | 6 ++----
 doc/man3/X509_VERIFY_PARAM_set_flags.pod   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/man3/X509_STORE_set_verify_cb_func.pod b/doc/man3/X509_STORE_set_verify_cb_func.pod
index f9fc1b1..68d6a65 100644
--- a/doc/man3/X509_STORE_set_verify_cb_func.pod
+++ b/doc/man3/X509_STORE_set_verify_cb_func.pod
@@ -32,16 +32,13 @@ X509_STORE_CTX_cert_crl_fn, X509_STORE_CTX_check_crl_fn,
 X509_STORE_CTX_check_issued_fn, X509_STORE_CTX_check_policy_fn,
 X509_STORE_CTX_check_revocation_fn, X509_STORE_CTX_cleanup_fn
 X509_STORE_CTX_get_crl_fn, X509_STORE_CTX_get_issuer_fn,
-X509_STORE_CTX_lookup_certs_fn, X509_STORE_CTX_lookup_crls_fn,
-X509_STORE_CTX_verify_cb, X509_STORE_CTX_verify_fn,
+X509_STORE_CTX_lookup_certs_fn, X509_STORE_CTX_lookup_crls_fn
 - set verification callback
 
 =head1 SYNOPSIS
 
  #include <openssl/x509_vfy.h>
 
- typedef int (*X509_STORE_CTX_verify_cb)(int ok, X509_STORE_CTX *ctx);
- typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *ctx);
  typedef int (*X509_STORE_CTX_get_issuer_fn)(X509 **issuer,
                                              X509_STORE_CTX *ctx, X509 *x);
  typedef int (*X509_STORE_CTX_check_issued_fn)(X509_STORE_CTX *ctx,
@@ -235,6 +232,7 @@ function type.
 =head1 SEE ALSO
 
 L<X509_STORE_CTX_set_verify_cb(3)>, L<X509_STORE_CTX_get0_chain(3)>,
+L<X509_STORE_CTX_verify_cb(3)>, L<X509_STORE_CTX_verify_fn(3)>,
 L<CMS_verify(3)>
 
 =head1 HISTORY
diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
index 76f1901..8f95cfa 100644
--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
@@ -3,7 +3,6 @@
 =head1 NAME
 
 X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags,
-X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags,
 X509_VERIFY_PARAM_get_flags, X509_VERIFY_PARAM_set_purpose,
 X509_VERIFY_PARAM_get_inh_flags, X509_VERIFY_PARAM_set_inh_flags,
 X509_VERIFY_PARAM_set_trust, X509_VERIFY_PARAM_set_depth,