diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-06-05 17:04:16 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-06-05 17:04:16 +0000 |
commit | 11f3cee93b667bc567262386fe84006afb6e6872 (patch) | |
tree | ae4c661d29f5a65af0a4e00224124fca5061f081 | |
parent | 6bf79e30eaa376df1bccaa6608e55b157044335d (diff) |
Update from stable branch.
-rw-r--r-- | engines/e_capi.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c index f2e45c9e50..b587d42378 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -56,22 +56,24 @@ #include <string.h> #include <openssl/crypto.h> #include <openssl/buffer.h> -#include <openssl/engine.h> #include <openssl/rsa.h> #include <openssl/bn.h> -#include <openssl/pem.h> #ifdef OPENSSL_SYS_WIN32 #ifndef OPENSSL_NO_CAPIENG -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#if _WIN32_WINNT < 0x0500 +#define _WIN32_WINNT 0x0500 #endif #include <windows.h> #include <wincrypt.h> -#undef X509_NAME +#undef X509_EXTENSIONS +#undef X509_CERT_PAIR + +#include <openssl/engine.h> +#include <openssl/pem.h> #include "e_capi_err.h" #include "e_capi_err.c" @@ -1616,6 +1618,7 @@ static int client_cert_select(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs) * CryptUIDlgSelectCertificateFromStore() to produce a dialog box. */ +#include <PrSht.h> #include <cryptuiapi.h> #define dlg_title L"OpenSSL Application SSL Client Certificate Selection" |