Commit 6cf2012a authored by Richard Levitte's avatar Richard Levitte
Browse files

Make dummy tests to make it easier to physically remove unwanted algorithms.

This should complete PR 75
parent e459ebae
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1449,6 +1449,7 @@ EOF
	my $make_targets = "";
	$make_targets .= " links" if $symlink;
	$make_targets .= " depend" if $depflags ne "" && $make_depend;
	$make_targets .= " gentests" if $symlink;
	(system $make_command.$make_targets) == 0 or exit $?
		if $make_targets ne "";
	if ( $perl =~ m@^/@) {
+4 −0
Original line number Diff line number Diff line
@@ -564,6 +564,10 @@ links:
	fi; \
	done;

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 );

dclean:
	rm -f *.bak
	@for i in $(DIRS) ;\
+8 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ top:

all:	exe

exe:	$(EXE)
exe:	$(EXE) dummytest

files:
	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -102,6 +102,10 @@ files:
links:
	@@$(TOP)/util/point.sh Makefile.ssl Makefile

generate: $(SRC)
$(SRC):
	@$(TOP)/util/point.sh dummytest.c $@

errors:

install:
@@ -362,6 +366,9 @@ $(EVPTEST): $(EVPTEST).o $(DLIBCRYPTO)
#$(RDTEST): $(RDTEST).o $(DLIBCRYPTO)
#	$(CC) -o $(RDTEST) $(CFLAGS) $(RDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

dummytest: dummytest.o $(DLIBCRYPTO)
	$(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)

# DO NOT DELETE THIS LINE -- make depend depends on it.

bftest.o: ../include/openssl/blowfish.h ../include/openssl/e_os2.h
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ IFS=:
if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
try_without_dir=false
# First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
for dir in dummy:$PATH; do
for dir in dummy${IFS}$PATH; do
    if [ "$try_without_dir" = true ]; then
      # first iteration
      pod2man=pod2man