[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b4b576d3b7c6ab57f419015d4d49846278ddd0d4 (commit)
      from  96d06c213d5a2c1af42dd3b5d7bcc4a65df90738 (commit)


- Log -----------------------------------------------------------------
commit b4b576d3b7c6ab57f419015d4d49846278ddd0d4
Author: Peter Mosmans <support at go-forward.net>
Date:   Mon Jun 13 15:04:33 2016 -0400

    RT3454: Re-enable nistp-64_gcc_128 on windows
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 include/openssl/ec.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index db78a34..b5bd83d 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -80,7 +80,6 @@ const EC_METHOD *EC_GFp_mont_method(void);
 const EC_METHOD *EC_GFp_nist_method(void);
 
 # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-#  ifndef OPENSSL_SYS_WIN32
 /** Returns 64-bit optimized methods for nistp224
  *  \return  EC_METHOD object
  */
@@ -95,7 +94,6 @@ const EC_METHOD *EC_GFp_nistp256_method(void);
  *  \return  EC_METHOD object
  */
 const EC_METHOD *EC_GFp_nistp521_method(void);
-#  endif
 # endif
 
 # ifndef OPENSSL_NO_EC2M