Commit 6fa805f5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

FIPS build fixes. 



PR#3673

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 06aab268

crypto/ec/ec_curve.c

+4 −4
Original line number Diff line number Diff line
@@ -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 */

crypto/ec/ec_cvt.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

ssl/t1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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

            {