generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIPS build fixes.

Browse Source 
PR#3673

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-01-22 19:43:27 +00:00
parent 06aab26874
commit 6fa805f516
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/ec/ec_curve.c
View File

@ -69,16 +69,16 @@
* *
*/ */
#ifdef OPENSSL_FIPS
# include <openssl/fips.h>
#endif
#include <string.h> #include <string.h>
#include "ec_lcl.h" #include "ec_lcl.h"
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/obj_mac.h> #include <openssl/obj_mac.h>
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#ifdef OPENSSL_FIPS
# include <openssl/fips.h>
#endif
typedef struct { typedef struct {
int field_type, /* either NID_X9_62_prime_field or int field_type, /* either NID_X9_62_prime_field or
* NID_X9_62_characteristic_two_field */ * NID_X9_62_characteristic_two_field */

6
crypto/ec/ec_cvt.c
View File

@ -69,13 +69,13 @@
* *
*/ */
#include <openssl/err.h>
#include "ec_lcl.h"
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
# include <openssl/fips.h> # include <openssl/fips.h>
#endif #endif
#include <openssl/err.h>
#include "ec_lcl.h"
EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
const BIGNUM *b, BN_CTX *ctx) const BIGNUM *b, BN_CTX *ctx)
{ {

2
ssl/t1_lib.c
View File

@ -470,7 +470,7 @@ static int tls1_get_curvelist(SSL *s, int sess,
# ifdef OPENSSL_FIPS # ifdef OPENSSL_FIPS
if (FIPS_mode()) { if (FIPS_mode()) {
*pcurves = fips_curves_default; *pcurves = fips_curves_default;
*pcurveslen = sizeof(fips_curves_default); pcurveslen = sizeof(fips_curves_default);
} else } else
# endif # endif
{ {