FIPS build fixes.

PR#3673

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 023bd0ec66df8a0202d91a86cb871f440eff8253..6dbe9d8258de4318a6de42de6f12f070830f9d83 100644 (file)
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -69,16 +69,16 @@
  *
  */
 
-#ifdef OPENSSL_FIPS
-# include <openssl/fips.h>
-#endif
-
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/opensslconf.h>
 
+#ifdef OPENSSL_FIPS
+# include <openssl/fips.h>
+#endif
+
 typedef struct {
     int field_type,             /* either NID_X9_62_prime_field or
                                  * NID_X9_62_characteristic_two_field */

diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 73cc123e8aef6ced47e6020a75ac8b8fa3dcafb3..5a832ba1cfa4a1fccb951d2bc972e094e0328ca7 100644 (file)
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -69,13 +69,13 @@
  *
  */
 
+#include <openssl/err.h>
+#include "ec_lcl.h"
+
 #ifdef OPENSSL_FIPS
 # include <openssl/fips.h>
 #endif
 
-#include <openssl/err.h>
-#include "ec_lcl.h"
-
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
                                  const BIGNUM *b, BN_CTX *ctx)
 {

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 72be01dd6334f2b5fcba143bf2614ef38eb7e4cf..90ef867931487c56e98f3b0d250e97b0c6e11f00 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -470,7 +470,7 @@ static int tls1_get_curvelist(SSL *s, int sess,
 # ifdef OPENSSL_FIPS
             if (FIPS_mode()) {
                 *pcurves = fips_curves_default;
-                *pcurveslen = sizeof(fips_curves_default);
+                pcurveslen = sizeof(fips_curves_default);
             } else
 # endif
             {