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

Redirect FIPS memory allocation to FIPS_malloc() routine, remove 

OpenSSL malloc dependencies.
parent e36d6b8f

Makefile.org

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/evp/e_des3.o \

	../crypto/evp/m_sha1.o \

	../crypto/hmac/hmac.o \

	../crypto/mem.o \

	../crypto/modes/cfb128.o \

	../crypto/modes/ctr128.o \

	../crypto/modes/ofb128.o \

crypto/bn/bn_blind.c

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,12 @@ 
#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

+6 −0
Original line number Diff line number Diff line
@@ -60,12 +60,18 @@ 
#endif

#endif



#define OPENSSL_FIPSAPI



#include <stdio.h>

#include <assert.h>



#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

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ 
#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

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ 
#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 */