Commit 7317192c authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix various windows compilation issues 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 537bf438

crypto/sha/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) 
AFLAGS= $(ASFLAGS)



GENERAL=Makefile

TEST=shatest.c sha1test.c sha256t.c sha512t.c

TEST=sha1test.c sha256t.c sha512t.c

APPS=



LIB=$(TOP)/libcrypto.a

ms/test.bat

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ echo bftest 
bftest

if errorlevel 1 goto done



echo shatest

shatest

if errorlevel 1 goto done



echo sha1test

sha1test

if errorlevel 1 goto done

ms/testce.bat

+0 −4
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ echo bftest 
call %test%\testce2 bftest

if errorlevel 1 goto done



echo shatest

call %test%\testce2 shatest

if errorlevel 1 goto done



echo sha1test

call %test%\testce2 sha1test

if errorlevel 1 goto done

util/mkdef.pl

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; 
my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;

my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;

my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;

my my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;

my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;

my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; 

my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace;

my $no_unit_test; my $no_ssl3_method; my $no_ocb;