[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  feb891990a5137bbe11768a11100d2b423a6b11e (commit)
      from  4ac139b49a954c9482e086f60e8dcf128e3c385d (commit)


- Log -----------------------------------------------------------------
commit feb891990a5137bbe11768a11100d2b423a6b11e
Author: Hannes Magnusson <bjori at mongodb.com>
Date:   Mon Mar 27 16:26:33 2017 -0700

    Remove redundant decl of 509_STORE_set_flags
    
    a47bc283 accidentally adds another define for X509_STORE_set_flags
    It is already defined 5lines prior
    
    CLA: trivial
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3047)

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

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

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index 64f56df..1aa0a33 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -272,7 +272,6 @@ int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);
 int X509_STORE_set_trust(X509_STORE *ctx, int trust);
 int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);
 X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx);
-int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);
 
 void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify_fn verify);
 #define X509_STORE_set_verify_func(ctx, func) \