Commit 75622f1e authored by Ben Laurie's avatar Ben Laurie
Browse files

Unfinished FIPS stuff for review/improvement.

parent a052dd65

Configure

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ my %table=( 
"debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",

"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",

"debug-ben-fips","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",

"debug-ben-fips-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

Makefile.org

+12 −3
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ LIBKRB5= 
# we might set SHLIB_MARK to '$(SHARED_LIBS)'.

SHLIB_MARK=



DIRS=   crypto ssl $(SHLIB_MARK) apps test tools

SHLIBDIRS= crypto ssl

DIRS=   fips crypto ssl $(SHLIB_MARK) apps test tools

SHLIBDIRS= fips crypto ssl



# dirs in crypto to build

SDIRS=  \
@@ -202,6 +202,7 @@ ONEDIRS=out tmp 
EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS

WDIRS=  windows

LIBS=   libcrypto.a libssl.a

SIGS=	libcrypto.a.sha1 libcrypto$(SHLIBEXT).sha1

SHARED_CRYPTO=libcrypto$(SHLIB_EXT)

SHARED_SSL=libssl$(SHLIB_EXT)

SHARED_LIBS=
@@ -219,7 +220,7 @@ HEADER= e_os.h 
# When we're prepared to use shared libraries in the programs we link here

# we might remove 'clean-shared' from the targets to perform at this stage



all: Makefile.ssl sub_all openssl.pc

all: Makefile.ssl sub_all openssl.pc sigs



sub_all:

	@for i in $(DIRS); \
@@ -831,6 +832,14 @@ install: all install_docs 
			sed -e '1,/^$$/d' doc/openssl-shared.txt; \

		fi; \

	fi

	@for i in $(SIGS) ;\

	do \

		if [ -f "$$i" ]; then \

		(       echo installing $$i; \

			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \

		fi; \

	done;

	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig

crypto/aes/Makefile.ssl

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c aes_locl.h 
aes_cfb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_cfb.o: ../../include/openssl/opensslconf.h aes_cfb.c aes_locl.h

aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h

aes_core.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h

aes_core.o: aes_core.c aes_locl.h

aes_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_ctr.o: ../../include/openssl/opensslconf.h aes_ctr.c aes_locl.h

aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

crypto/aes/aes_core.c

+4 −0
Original line number Diff line number Diff line
@@ -37,8 +37,11 @@ 


#include <stdlib.h>

#include <openssl/aes.h>

#include <openssl/fips.h>

#include "aes_locl.h"



#ifndef FIPS



/*

Te0[x] = S [x].[02, 01, 01, 03];

Te1[x] = S [x].[03, 02, 01, 01];
@@ -1255,3 +1258,4 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, 
	PUTU32(out + 12, s3);

}



#endif /* ndef FIPS */

crypto/cryptlib.c

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ 
static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */

#endif



#ifdef FIPS

int FIPS_mode;

void *FIPS_rand_check;

#endif /* def FIPS */



DECLARE_STACK_OF(CRYPTO_dynlock)

IMPLEMENT_STACK_OF(CRYPTO_dynlock)