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

Various mingw64 fixes.

parent afa4b386

crypto/engine/eng_aesni.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int aesni_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 


#define AESNI_MIN_ALIGN	16

#define AESNI_ALIGN(x) \

	((void *)(((unsigned long)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))

	((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))



/* Engine names */

static const char   aesni_id[] = "aesni",

crypto/rc4/asm/rc4-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ $out="%rcx"; # arg4 
{

$code=<<___;

.text

.extern	OPENSSL_ia32cap_P



.globl	RC4

.type	RC4,\@function,4
@@ -425,7 +426,6 @@ $idx="%r8"; 
$ido="%r9";



$code.=<<___;

.extern	OPENSSL_ia32cap_P

.globl	RC4_set_key

.type	RC4_set_key,\@function,3

.align	16

crypto/srp/srp_lib.c

+11 −7
Original line number Diff line number Diff line
@@ -63,13 +63,17 @@ 
#include <openssl/evp.h>



#if (BN_BYTES == 8)

#define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##ul

# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)

#  define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##UI64

# elif defined(__arch64__)

#  define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##UL

# else

#  define bn_pack4(a1,a2,a3,a4) 0x##a1##a2##a3##a4##ULL

# endif

#if (BN_BYTES == 4)

#define bn_pack4(a1,a2,a3,a4)  0x##a3##a4##ul, 0x##a1##a2##ul

#endif

#if (BN_BYTES == 2)

#define bn_pack4(a1,a2,a3,a4) 0x##a4##u,0x##a3##u,0x##a2##u,0x##a1##u

#elif (BN_BYTES == 4)

# define bn_pack4(a1,a2,a3,a4)  0x##a3##a4##UL, 0x##a1##a2##UL

#else

# error "unsupported BN_BYTES"

#endif