[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c106eaa8ed7c24900e4367fc85cae1a77bc4e5ae (commit)
      from  7606c231c9e056822c4613c7617390bcdb822108 (commit)


- Log -----------------------------------------------------------------
commit c106eaa8ed7c24900e4367fc85cae1a77bc4e5ae
Author: Hannes Magnusson <bjori at 10gen.com>
Date:   Tue Jul 12 14:33:25 2016 -0700

    Remove reduntant X509_STORE_CTX_set_verify_cb declaration
    
    f0e0fd51fd8307f6eae64862ad9aaea113f1177a added X509_STORE_CTX_set_verify_cb
    with a typedef'd argument, making the original one redundant.
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 include/openssl/x509_vfy.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index 183889a..19895bf 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -360,8 +360,6 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
 void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);
 void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
                              time_t t);
-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-                                  int (*verify_cb) (int, X509_STORE_CTX *));
 
 X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx);
 int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx);