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

*** empty log message ***

parent eead69f5

Makefile.fips

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
## Makefile for OpenSSL: fipscanister.o only

##



VERSION=

VERSION=fips-2.0-test

MAJOR=

MINOR=

SHLIB_VERSION_NUMBER=
@@ -180,7 +180,7 @@ SHARED_LDFLAGS= 
GENERAL=        Makefile

BASENAME=       openssl

NAME=           $(BASENAME)-$(VERSION)

TARFILE=        $(NAME).tar

TARFILE=        openssl-fips-test-2.0.tar

WTARFILE=       $(NAME)-win.tar

EXHEADER=       e_os2.h

HEADER=         e_os.h
@@ -600,7 +600,7 @@ tar: 
	find . -type d -print | xargs chmod 755

	find . -type f -print | xargs chmod a+r

	find . -type f -perm -0100 -print | xargs chmod a+x

	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \

	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | $(BUILDENV) $(PERL) util/fipsdist.pl | sort > ../$(TARFILE).list; \

	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \

	tardy --user_number=0  --user_name=openssl \

	      --group_number=0 --group_name=openssl \
@@ -618,7 +618,7 @@ tar-snap: 
	ls -l ../$(TARFILE)



dist:   

	$(PERL) Configure dist

	$(PERL) Configure dist fipscanisteronly

	@$(MAKE) dist_pem_h

	@$(MAKE) SDIRS='$(SDIRS)' clean

	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar

test/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ dclean: 
			testreq.pem



clean:

	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest

	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) $(FIPSEXE) *.ss *.srl log dummytest



$(DLIBSSL):

	(cd ..; $(MAKE) DIRS=ssl all)

util/fipsobj.pl

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ my $dir = $ARGV[0]; 


my $asmobjs = "";



# Add any needed assembly languagr files.

# Add any needed assembly language files.



$asmobjs = $ENV{AES_ENC} if $dir eq "aes";

$asmobjs = $ENV{BN_ASM} if $dir eq "bn";