Commit f87e3078 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Adapt mingw config for newer mingw environment. Note modified conditional 

compilation in e_capi.c.
PR: 2113
parent 70b76d39

Configure

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ my %table=( 
"BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",



# MinGW

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",

# As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll

# compiled with one compiler with application compiled with another

# compiler. It's possible to engage Applink support in mingw64 build,

TABLE

+2 −2
Original line number Diff line number Diff line
@@ -3877,11 +3877,11 @@ $multilib = 64 


*** mingw

$cc           = gcc

$cflags       = -mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall

$cflags       = -mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall

$unistd       = 

$thread_cflag = 

$sys_id       = MINGW32

$lflags       = -lws2_32 -lgdi32

$lflags       = -lws2_32 -lgdi32 -lcrypt32

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT EXPORT_VAR_AS_FN

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o

engines/e_capi.c

+19 −2
Original line number Diff line number Diff line
@@ -71,6 +71,22 @@ 


#include <wincrypt.h>



/*

 * This module uses several "new" interfaces, among which is

 * 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.

 */

#ifdef CERT_KEY_PROV_INFO_PROP_ID

# define __COMPILE_CAPIENG

#endif /* CERT_KEY_PROV_INFO_PROP_ID */

#endif /* OPENSSL_NO_CAPIENG */

#endif /* OPENSSL_SYS_WIN32 */



#ifdef __COMPILE_CAPIENG



#undef X509_EXTENSIONS

#undef X509_CERT_PAIR
@@ -1784,12 +1800,13 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs) 
	}

#endif



#endif

#else /* !WIN32 */

#else /* !__COMPILE_CAPIENG */

#include <openssl/engine.h>

#ifndef OPENSSL_NO_DYNAMIC_ENGINE

OPENSSL_EXPORT

int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }

IMPLEMENT_DYNAMIC_CHECK_FN()

#else

void ENGINE_load_capi(void){}

#endif

#endif