generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
a precedence problem with the zlib header. See CHANGES for details.
This commit is contained in:
Daniel Stenberg
2004-12-19 09:37:32 +00:00
parent 090a7f38be
commit 3d647b9a98
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ssluse.c
View File

@@ -90,10 +90,9 @@
#undef HAVE_ENGINE_LOAD_FOUR_ARGS #undef HAVE_ENGINE_LOAD_FOUR_ARGS
#endif #endif
#if OPENSSL_VERSION_NUMBER >= 0x00903001L #if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && defined(HAVE_OPENSSL_PKCS12_H)
/* OpenSSL has PKCS 12 support */ /* OpenSSL has PKCS 12 support */
#define HAVE_PKCS12_SUPPORT #define HAVE_PKCS12_SUPPORT
#include <openssl/pkcs12.h>
#else #else
/* OpenSSL/SSLEay does not have PKCS12 support */ /* OpenSSL/SSLEay does not have PKCS12 support */
#undef HAVE_PKCS12_SUPPORT #undef HAVE_PKCS12_SUPPORT

3
lib/urldata.h
View File

@@ -61,6 +61,9 @@
#ifdef HAVE_OPENSSL_ENGINE_H #ifdef HAVE_OPENSSL_ENGINE_H
#include <openssl/engine.h> #include <openssl/engine.h>
#endif #endif
#ifdef HAVE_OPENSSL_PKCS12_H
#include <openssl/pkcs12.h>
#endif
#else #else
#include "rsa.h" #include "rsa.h"
#include "crypto.h" #include "crypto.h"