Commit 3d647b9a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

if the pkcs12.h header exists, include it already in urldata.h to work around 

a precedence problem with the zlib header. See CHANGES for details.
parent 090a7f38

lib/ssluse.c

+1 −2
Original line number Diff line number Diff line
@@ -90,10 +90,9 @@ 
#undef HAVE_ENGINE_LOAD_FOUR_ARGS

#endif



#if OPENSSL_VERSION_NUMBER >= 0x00903001L

#if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && defined(HAVE_OPENSSL_PKCS12_H)

/* OpenSSL has PKCS 12 support */

#define HAVE_PKCS12_SUPPORT

#include <openssl/pkcs12.h>

#else

/* OpenSSL/SSLEay does not have PKCS12 support */

#undef HAVE_PKCS12_SUPPORT

lib/urldata.h

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ 
#ifdef HAVE_OPENSSL_ENGINE_H

#include <openssl/engine.h>

#endif

#ifdef HAVE_OPENSSL_PKCS12_H

#include <openssl/pkcs12.h>

#endif

#else

#include "rsa.h"

#include "crypto.h"