[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  7317192c645f24dfdb0c8340b871bc045454f8f4 (commit)
      from  537bf4381b0db3436e8ef8daff65e39e8593eecf (commit)


- Log -----------------------------------------------------------------
commit 7317192c645f24dfdb0c8340b871bc045454f8f4
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jan 28 13:01:44 2015 +0000

    Fix various windows compilation issues
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/sha/Makefile |    2 +-
 ms/test.bat         |    4 ----
 ms/testce.bat       |    4 ----
 util/mkdef.pl       |    2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index c72bba6..17dcbc8 100644
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -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
diff --git a/ms/test.bat b/ms/test.bat
index d0b6060..e8b7ae2 100755
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -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
diff --git a/ms/testce.bat b/ms/testce.bat
index 8de94a4..9b309e4 100644
--- a/ms/testce.bat
+++ b/ms/testce.bat
@@ -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
diff --git a/util/mkdef.pl b/util/mkdef.pl
index b67d14b..faed402 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -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;