Commit 4b55c2a3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Move the Win32 #undefs of X509_NAME and PKCS7_ISSUER_AND_SERIAL so they will 

always get included with the relevant files.
parent 470df4b9

crypto/pkcs7/pkcs7.h

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ extern "C" { 
#include <openssl/bio.h>

#include <openssl/x509.h>



#ifdef WIN32

/* Under Win32 this is defined in wincrypt.h */

#undef PKCS7_ISSUER_AND_SERIAL

#endif



/*

Encryption_ID		DES-CBC

Digest_ID		MD5

crypto/x509/x509.h

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ extern "C" { 


#include <openssl/evp.h>





#ifdef WIN32

/* Under Win32 this is defined in wincrypt.h */

#undef X509_NAME

#endif



#define X509_FILETYPE_PEM	1

#define X509_FILETYPE_ASN1	2

#define X509_FILETYPE_DEFAULT	3

e_os.h

+0 −3
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ extern "C" { 
#ifdef WIN32

#define get_last_sys_error()	GetLastError()

#define clear_sys_error()	SetLastError(0)

/* These are defined in wincrypt.h and can cause problems */

#undef X509_NAME

#undef PKCS7_SIGNER_INFO

#if !defined(WINNT)

#define WIN_CONSOLE_BUG

#endif