Add anchors for AES, SHA-256/-512 assembler modules and SSE2 code pathes. (d0590fe6) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+181 −216

File changed.

Preview size limit exceeded, changes collapsed.

Makefile.org

+28 −7

Original line number	Diff line number	Diff line
		@@ -108,6 +108,8 @@ DES_ENC= asm/dx86-out.o asm/yx86-out.o
		#DES_ENC= asm/dx86-out.o asm/yx86-out.o # a.out, FreeBSD
		#DES_ENC= asm/dx86bsdi.o asm/yx86bsdi.o # bsdi

		AES_ASM_OBJ=

		# Set BF_ENC to bf_enc.o if you want to use the C version
		#There are 4 x86 assember options.
		BF_ENC= asm/bx86-out.o
		@@ -217,10 +219,28 @@ HEADER= e_os.h

		all: Makefile.ssl build_all openssl.pc

		BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
		SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' \
		CC='${CC}' CFLAG='${CFLAG}' \
		AS='${AS}' ASFLAG='${ASFLAG}' \
		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
		LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' \
		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' \
		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' \
		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' \
		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' \
		AES_ASM_OBJ='${AES_ASM_OBJ}' \
		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}'

		BUILD_CMD=if echo " $(DIRS) " \| grep " $$dir " >/dev/null 2>/dev/null; then \
		if [ -d "$$dir" ]; then \
		(cd $$dir && echo "making $$target in $$dir..." && \
		$(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}' SHARED_LDFLAGS='${SHARED_LDFLAGS}' LIBRPATH='$(INSTALLTOP)/lib' $$target ) \|\| exit 1; \
		$(MAKE) $(BUILDENV) $$target ) \|\| exit 1; \
		else \
		$(MAKE) $$dir; \
		fi; fi
		@@ -252,6 +272,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a
		$(MAKE) SHLIBDIRS=crypto build-shared; \
		else \
		echo "There's no support for shared libraries on this platform" >&2; \
		exit 1; \
		fi

		libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
		@@ -259,6 +280,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
		else \
		echo "There's no support for shared libraries on this platform" >&2; \
		exit 1; \
		fi

		clean-shared:
		@@ -292,8 +314,7 @@ do_$(SHLIB_TARGET):
		libs="$(LIBKRB5) $$libs"; \
		fi; \
		$(NEWMAKE) -f Makefile.shared \
		CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
		$(BUILDENV) \
		LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
		LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
		LIBDEPS="$$libs $(EX_LIBS)" \
		@@ -363,7 +384,7 @@ links:

		gentests:
		@(cd test && echo "generating dummy tests (if needed)..." && \
		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' 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}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
		$(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );

		dclean:
		rm -f *.bak
		@@ -392,7 +413,7 @@ test: tests

		tests: rehash
		@(cd test && echo "testing..." && \
		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' 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}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
		$(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
		@LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
		DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
		SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
		@@ -491,7 +512,7 @@ dist:
		@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar

		dist_pem_h:
		(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
		(cd crypto/pem; $(MAKE) $(BUILDENV) pem.h; $(MAKE) clean)

		install: all install_docs install_sw

		@@ -513,7 +534,7 @@ install_sw:
		do \
		if [ -d "$$i" ]; then \
		(cd $$i; echo "installing $$i..."; \
		$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' install ); \
		$(MAKE) $(BUILDENV) INSTALL_PREFIX='${INSTALL_PREFIX}' OPENSSLDIR='${OPENSSLDIR}' install ); \
		fi; \
		done
		@set -e; for i in $(LIBS) ;\

Makefile.shared

+1 −0

Original line number	Diff line number	Diff line
		@@ -595,6 +595,7 @@ link_o.hpux:
		@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
		$(CALC_VERSIONS); \
		SHLIB=lib$(LIBNAME).sl; \
		expr $(PLATFORM) : 'ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
		SHLIB_SUFFIX=; \
		LIBDEPS="$(LIBDEPS)"; \
		ALLSYMSFLAGS='-Wl,-Fl'; \

config

+5 −4

Original line number	Diff line number	Diff line
		@@ -663,8 +663,8 @@ EOF
		hppa--openbsd) OUT="OpenBSD-hppa" ;;
		--openbsd) OUT="OpenBSD" ;;
		86-*-bsdi4) OUT="bsdi-elf-gcc" ;;
		--osf) OUT="alphaold-cc" ;;
		--tru64) OUT="alpha-cc" ;;
		--osf) OUT="osf1-alpha-cc" ;;
		--tru64) OUT="tru64-alpha-cc" ;;
		--OpenUNIX*)
		if [ "$CC" = "gcc" ]; then
		OUT="OpenUNIX-8-gcc"
		@@ -781,9 +781,10 @@ esac
		# gcc < 2.8 does not support -mcpu=ultrasparc
		if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
		then
		echo "WARNING! Do consider upgrading to gcc-2.8 or later."
		echo "WARNING! Falling down to 'solaris-sparcv8-gcc'."
		echo " Upgrade to gcc-2.8 or later."
		sleep 5
		OUT=solaris-sparcv9-gcc27
		OUT=solaris-sparcv8-gcc
		fi
		if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ]
		then

crypto/aes/Makefile.ssl

+3 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@ MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
		MAKEFILE= Makefile.ssl
		AR= ar r

		# CFLAGS= -mpentiumpro $(INCLUDES) $(CFLAG) -O3 -fexpensive-optimizations -funroll-loops -fforce-addr
		AES_ASM_OBJ=

		CFLAGS= $(INCLUDES) $(CFLAG)

		GENERAL=Makefile
		@@ -27,7 +28,7 @@ APPS=

		LIB=$(TOP)/libcrypto.a
		LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c
		LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o
		LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o $(AES_ASM_OBJ)

		SRC= $(LIBSRC)