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

Changes to allow capi ENGINE to compile with older headers on e.g. VC6.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2008-06-25 10:41:48 +00:00
parent 4afcee8b4b
commit 705c3dec2c
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
engines/e_capi.c
View File

@@ -62,12 +62,27 @@
#ifdef OPENSSL_SYS_WIN32 #ifdef OPENSSL_SYS_WIN32
#ifndef OPENSSL_NO_CAPIENG #ifndef OPENSSL_NO_CAPIENG
#include <windows.h> #include <windows.h>
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0400
#endif
#include <wincrypt.h> #include <wincrypt.h>
#undef X509_EXTENSIONS #undef X509_EXTENSIONS
#undef X509_CERT_PAIR #undef X509_CERT_PAIR
/* Definitions which may be missing from earlier version of headers */
#ifndef CERT_STORE_OPEN_EXISTING_FLAG
#define CERT_STORE_OPEN_EXISTING_FLAG 0x00004000
#endif
#ifndef CERT_STORE_CREATE_NEW_FLAG
#define CERT_STORE_CREATE_NEW_FLAG 0x00002000
#endif
#include <openssl/engine.h> #include <openssl/engine.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
@@ -1670,8 +1685,14 @@ static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
* CryptUIDlgSelectCertificateFromStore() to produce a dialog box. * CryptUIDlgSelectCertificateFromStore() to produce a dialog box.
*/ */
#include <PrSht.h> /* Definitions which are in cryptuiapi.h but this is not present in older
#include <cryptuiapi.h> * versions of headers.
*/
#ifndef CRYPTUI_SELECT_LOCATION_COLUMN
#define CRYPTUI_SELECT_LOCATION_COLUMN 0x000000010
#define CRYPTUI_SELECT_INTENDEDUSE_COLUMN 0x000000004
#endif
#define dlg_title L"OpenSSL Application SSL Client Certificate Selection" #define dlg_title L"OpenSSL Application SSL Client Certificate Selection"
#define dlg_prompt L"Select a certificate to use for authentication" #define dlg_prompt L"Select a certificate to use for authentication"
@@ -1714,7 +1735,9 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
} }
} }
hwnd = GetActiveWindow(); hwnd = GetForegroundWindow();
if (!hwnd)
hwnd = GetActiveWindow();
if (!hwnd && ctx->getconswindow) if (!hwnd && ctx->getconswindow)
hwnd = ctx->getconswindow(); hwnd = ctx->getconswindow();
/* Call dialog to select one */ /* Call dialog to select one */