[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1755d4601231f96e9011abc3d2f40e7bd31320ee (commit)
      from  670ad0fbf6ebcf113e278d8174081a7e2d2fa44c (commit)


- Log -----------------------------------------------------------------
commit 1755d4601231f96e9011abc3d2f40e7bd31320ee
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Sat Apr 23 00:39:20 2016 -0400

    API compat macros for renamed X509_STORE_CTX functions
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 include/openssl/x509_vfy.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index 4bf27e9..99d5e21 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -316,6 +316,12 @@ void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,
                                X509_STORE_CTX_verify verify);
 X509_STORE_CTX_verify X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);
 
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define X509_STORE_CTX_get_chain X509_STORE_CTX_get0_chain
+# define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
+# define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
+#endif
+
 X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
 X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
 X509_LOOKUP_METHOD *X509_LOOKUP_file(void);