diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 19:50:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 19:50:13 +0000 |
| commit | b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b (patch) | |
| tree | 4722cd31e41fdda28e5c2b37bdf8500d27868384 /openssl/engines/e_capi.c | |
| parent | 8cd59857a99c534c560f58c931f5c2466d4c1f9b (diff) | |
| download | vcxsrv-b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b.tar.gz vcxsrv-b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b.tar.bz2 vcxsrv-b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b.zip | |
Updated to openssl-1.0.0c
Diffstat (limited to 'openssl/engines/e_capi.c')
| -rw-r--r-- | openssl/engines/e_capi.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/openssl/engines/e_capi.c b/openssl/engines/e_capi.c index e2a7cb58b..5871491fd 100644 --- a/openssl/engines/e_capi.c +++ b/openssl/engines/e_capi.c @@ -76,10 +76,16 @@ * CertGetCertificateContextProperty. CERT_KEY_PROV_INFO_PROP_ID is * one of possible values you can pass to function in question. By * checking if it's defined we can see if wincrypt.h and accompanying - * crypt32.lib are in shape. Yes, it's rather "weak" test and if - * compilation fails, then re-configure with -DOPENSSL_NO_CAPIENG. + * crypt32.lib are in shape. The native MingW32 headers up to and + * including __W32API_VERSION 3.14 lack of struct DSSPUBKEY and the + * defines CERT_STORE_PROV_SYSTEM_A and CERT_STORE_READONLY_FLAG, + * so we check for these too and avoid compiling. + * Yes, it's rather "weak" test and if compilation fails, + * then re-configure with -DOPENSSL_NO_CAPIENG. */ -#ifdef CERT_KEY_PROV_INFO_PROP_ID +#if defined(CERT_KEY_PROV_INFO_PROP_ID) && \ + defined(CERT_STORE_PROV_SYSTEM_A) && \ + defined(CERT_STORE_READONLY_FLAG) # define __COMPILE_CAPIENG #endif /* CERT_KEY_PROV_INFO_PROP_ID */ #endif /* OPENSSL_NO_CAPIENG */ |