[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b2db9c18b23f59c3a08ef10f0ee85f24d43da2a4 (commit)
      from  32c1356302e74dfa5e8bd2d7002c18d91a323b70 (commit)


- Log -----------------------------------------------------------------
commit b2db9c18b23f59c3a08ef10f0ee85f24d43da2a4
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Aug 25 16:05:18 2017 -0400

    MSC_VER <= 1200 isn't supported; remove dead code
    
    VisualStudio 6 and earlier aren't supported.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4263)

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

Summary of changes:
 CHANGES             | 4 ++++
 crypto/sha/sha512.c | 3 ---
 e_os.h              | 8 --------
 test/ectest.c       | 5 -----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index f9b58f9..2cf6993 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@
 
  Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]
 
+  *) Some macro definitions to support VS6 have been removed.  Visual
+     Studio 6 has not worked since 1.1.0
+     [Rich Salz]
+
   *) Add ERR_clear_last_mark(), to allow callers to clear the last mark
      without clearing the errors.
      [Richard Levitte]
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index e94de43..263bae2 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -399,9 +399,6 @@ static SHA_LONG64 __fastcall __pull64be(const void *x)
 }
 #    endif
 #    define PULL64(x) __pull64be(&(x))
-#    if _MSC_VER<=1200
-#     pragma inline_depth(0)
-#    endif
 #   endif
 #  endif
 # endif
diff --git a/e_os.h b/e_os.h
index 5f4ba3e..2310e32 100644
--- a/e_os.h
+++ b/e_os.h
@@ -196,14 +196,6 @@ static __inline unsigned int _strlen31(const char *str)
 }
 #   endif
 #   include <malloc.h>
-#   if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace)
-       /* compensate for bug in VC6 ctype.h */
-#    undef isspace
-#    undef isdigit
-#    undef isalnum
-#    undef isupper
-#    undef isxdigit
-#   endif
 #   if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
 #    if _MSC_VER>=1300 && _MSC_VER<1600
 #     undef stdin
diff --git a/test/ectest.c b/test/ectest.c
index 3267a3d..03d7943 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -23,11 +23,6 @@
 # include <openssl/bn.h>
 # include <openssl/opensslconf.h>
 
-# if defined(_MSC_VER) && defined(_MIPS_) && (_MSC_VER/100==12)
-/* suppress "too big too optimize" warning */
-#  pragma warning(disable:4959)
-# endif
-
 static size_t crv_len = 0;
 static EC_builtin_curve *curves = NULL;