Commit 7edfe674 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Move all FIPSAPI renames into fips.h header file, include early in 

crypto.h if needed.

Modify source tree to handle change.
parent d8ad2e61

crypto/bn/bn_blind.c

+2 −6
Original line number Diff line number Diff line
@@ -109,16 +109,12 @@ 
 * [including the GNU Public Licence.]

 */



#define OPENSSL_FIPSAPI



#include <stdio.h>

#include "cryptlib.h"

#include "bn_lcl.h"



#define OPENSSL_FIPSAPI



#ifdef OPENSSL_FIPS

#include <openssl/fips.h>

#endif



#define BN_BLINDING_COUNTER	32



struct bn_blinding_st

crypto/bn/bn_ctx.c

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ 
#include "cryptlib.h"

#include "bn_lcl.h"



#ifdef OPENSSL_FIPS

#include <openssl/fips.h>

#endif



/* TODO list

 *

 * 1. Check a bunch of "(words+1)" type hacks in various bignum functions and

crypto/bn/bn_exp.c

+1 −5
Original line number Diff line number Diff line
@@ -109,15 +109,11 @@ 
 *

 */



#define OPENSSL_FIPSAPI



#include "cryptlib.h"

#include "bn_lcl.h"



#define OPENSSL_FIPSAPI

#ifdef OPENSSL_FIPS

#include <openssl/fips.h>

#endif



/* maximum precomputation table size for *variable* sliding windows */

#define TABLE_SIZE	32

crypto/bn/bn_lib.c

+2 −5
Original line number Diff line number Diff line
@@ -61,17 +61,14 @@ 
# define NDEBUG

#endif



#define OPENSSL_FIPSAPI



#include <assert.h>

#include <limits.h>

#include <stdio.h>

#include "cryptlib.h"

#include "bn_lcl.h"



#define OPENSSL_FIPSAPI

#ifdef OPENSSL_FIPS

#include <openssl/fips.h>

#endif



const char BN_version[]="Big Number" OPENSSL_VERSION_PTEXT;



/* This stuff appears to be completely unused, so is deprecated */

crypto/bn/bn_mont.c

+0 −4
Original line number Diff line number Diff line
@@ -122,10 +122,6 @@ 
#include "cryptlib.h"

#include "bn_lcl.h"



#ifdef OPENSSL_FIPS

#include <openssl/fips.h>

#endif



#define MONT_WORD /* use the faster word-based algorithm */



#ifdef MONT_WORD