[openssl.org #3454] remove OPENSSL_SYS_WIN constraint for EC_GFp_nistp224_method()

[Support via RT]

Hi,

Currently (14-07-2014, commit f8571ce82) the master branch doesn't
compile on Windows (mingw64) when using the enable-ec_nistp_64_gcc_128
option. The same option does work however on the OpenSSL_1_0_2-stable
branch.

This is due to a small difference in the file crypto/ec/ec.h. On
11-02-2011, a patch was applied (commit 65847ca378) only to the master
branch to (temporary ?) disable compiling on the WIN32 platform:

commit 65847ca378ea168964fbd9d36d970297d4fe45d7
Date:   Thu Feb 3 13:00:08 2011 +0000

    For now disable EC_GFp_nistp224_method() for WIN32 so the WIN32 build
    completes without linker errors.


Please find attached a patch for the master branch that removes this
restriction (and brings it more in line with the OpenSSL_1_0_2-stable
branch). This patch will make sure that compiling on Windows using the
enable-ec_nistp_64_gcc_128 flag works (again).


diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index c357b27..ce33942 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -152,7 +152,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
  */
@@ -168,7 +167,6 @@ const EC_METHOD *EC_GFp_nistp256_method(void);
  */
 const EC_METHOD *EC_GFp_nistp521_method(void);
 #endif
-#endif

 #ifndef OPENSSL_NO_EC2M
 /********************************************************************/


Thanks in advance,

Peter Mosmans




diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index c357b27..ce33942 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -152,7 +152,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
  */
@@ -168,7 +167,6 @@ const EC_METHOD *EC_GFp_nistp256_method(void);
  */
 const EC_METHOD *EC_GFp_nistp521_method(void);
 #endif
-#endif
 
 #ifndef OPENSSL_NO_EC2M
 /********************************************************************/