Commit 4ed9388e authored by Richard Levitte's avatar Richard Levitte
Browse files

A new branch for FIPS-related changes has been created with the name 

OpenSSL-fips-0_9_7-stable.

Since the 0.9.7-stable branch is supposed to be in freeze and should
only contain bug corrections, this change removes the FIPS changes
from that branch.
parent 94a1183f

Configure

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ 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

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

SHLIB_MARK=



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

SHLIBDIRS= fips crypto ssl

DIRS=   crypto ssl $(SHLIB_MARK) apps test tools

SHLIBDIRS= crypto ssl



# dirs in crypto to build

SDIRS=  objects \

SDIRS=  \

	md2 md4 md5 sha mdc2 hmac ripemd \

	des rc2 rc4 rc5 idea bf cast \

	bn ec rsa dsa dh dso engine aes \

	buffer bio stack lhash rand err \

	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5



FDIRS=	rand sha1 des aes dsa



# tests to perform.  "alltests" is a special word indicating that all tests

# should be performed.

TESTS = alltests
@@ -204,7 +202,6 @@ 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.sha1

SHARED_CRYPTO=libcrypto$(SHLIB_EXT)

SHARED_SSL=libssl$(SHLIB_EXT)

SHARED_LIBS=
@@ -222,29 +219,14 @@ 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 sigs



sigs:

	fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.sha1

	if [ "$(SHLIBEXT)" != "" ]; then fips/sha1/fips_standalone_sha1 libcrypto$(SHLIBEXT) >> libcrypto.sha1; fi

all: Makefile.ssl sub_all openssl.pc



sub_all:

	@for i in $(DIRS); \

	do \

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

		(cd $$i && echo "making all in $$i..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' FDIRS='$(FDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; \

	done;



sub_target:

	@for i in $(DIRS); \

	do \

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

		(cd $$i && echo "making $(TARGET) in $$i..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' FDIRS='$(FDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TARGET='$(TARGET)' sub_target ) || exit 1; \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; \
@@ -849,14 +831,6 @@ 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

TABLE

+0 −50
Original line number Diff line number Diff line
@@ -1550,56 +1550,6 @@ $shared_extension = 
$ranlib       = 

$arflags      = 



*** debug-ben-fips

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = 

$bn_ops       = 

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 



*** debug-ben-fips-debug

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = 

$bn_ops       = 

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o

$des_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 



*** debug-ben-openbsd

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe

crypto/aes/Makefile.ssl

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ 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/fips.h ../../include/openssl/opensslconf.h

aes_core.o: aes_core.c aes_locl.h

aes_core.o: ../../include/openssl/opensslconf.h 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.h

+0 −9
Original line number Diff line number Diff line
@@ -95,15 +95,6 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, 
void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc);

void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc);

void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc);

void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,

			    const int nbits,const AES_KEY *key,

			    unsigned char *ivec,const int enc);

void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num);