generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't add trailing slash to FIPSDIR: it causes problems with Windows builds.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-06-18 19:02:12 +00:00
parent 174b26c497
commit 4a18d5c89b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configure
View File

@ -674,7 +674,7 @@ my $fips=0;
if (exists $ENV{FIPSDIR}) if (exists $ENV{FIPSDIR})
{ {
$fipsdir = $ENV{FIPSDIR}; $fipsdir = $ENV{FIPSDIR};
$fipsdir .= "/" unless $fipsdir =~ /\/$/; $fipsdir =~ s/\/$//;
} }
# All of the following is disabled by default (RC5 was enabled before 0.9.8): # All of the following is disabled by default (RC5 was enabled before 0.9.8):
@ -958,7 +958,7 @@ if (defined($disabled{"md5"}) || defined($disabled{"rsa"}))
if ($fips && $fipslibdir eq "") if ($fips && $fipslibdir eq "")
{ {
$fipslibdir = $fipsdir . "lib/"; $fipslibdir = $fipsdir . "/lib/";
} }
# SSL 3.0 and TLS requires MD5 and SHA and either RSA or DSA+DH # SSL 3.0 and TLS requires MD5 and SHA and either RSA or DSA+DH
@ -1422,7 +1422,7 @@ $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/);
if ($fips) if ($fips)
{ {
$openssl_other_defines.="#define OPENSSL_FIPS\n"; $openssl_other_defines.="#define OPENSSL_FIPS\n";
$cflags .= " -I\$(FIPSDIR)include"; $cflags .= " -I\$(FIPSDIR)/include";
} }
$cpuid_obj="mem_clr.o" unless ($cpuid_obj =~ /\.o$/); $cpuid_obj="mem_clr.o" unless ($cpuid_obj =~ /\.o$/);

2
Makefile.org
View File

@ -295,7 +295,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
@if [ "$(SHLIB_TARGET)" != "" ]; then \ @if [ "$(SHLIB_TARGET)" != "" ]; then \
if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
FIPSLD_LIBCRYPTO=libcrypto.a ; \ FIPSLD_LIBCRYPTO=libcrypto.a ; \
FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; \ FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \ export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
fi; \ fi; \
$(MAKE) -e SHLIBDIRS=crypto build-shared; \ $(MAKE) -e SHLIBDIRS=crypto build-shared; \

2
apps/Makefile
View File

@ -154,7 +154,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
shlib_target="$(SHLIB_TARGET)"; \ shlib_target="$(SHLIB_TARGET)"; \
elif [ -n "$(FIPSCANLIB)" ]; then \ elif [ -n "$(FIPSCANLIB)" ]; then \
FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; export CC FIPSLD_CC; \ FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
fi; \ fi; \
LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
$(MAKE) -f $(TOP)/Makefile.shared -e \ $(MAKE) -f $(TOP)/Makefile.shared -e \

2
test/Makefile
View File

@ -357,7 +357,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
fi; \ fi; \
LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; export CC FIPSLD_CC; \ FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
fi; \ fi; \
$(MAKE) -f $(TOP)/Makefile.shared -e \ $(MAKE) -f $(TOP)/Makefile.shared -e \
CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \

6
util/mk1mf.pl
View File

@ -59,7 +59,7 @@ while(<IN>) {
} }
close(IN); close(IN);
$fipsdir =~ tr/\\/\//; $fipsdir =~ tr/\//${o}/;
$debug = 1 if $mf_platform =~ /^debug-/; $debug = 1 if $mf_platform =~ /^debug-/;
die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq ""; die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
@ -483,10 +483,10 @@ ASM=$bin_dir$asm
FIPSDIR=$fipsdir FIPSDIR=$fipsdir
BASEADDR=$baseaddr BASEADDR=$baseaddr
FIPSLIB_D=\$(FIPSDIR)lib FIPSLIB_D=\$(FIPSDIR)${o}lib
FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c
O_FIPSCANISTER=\$(FIPSLIB_D)${o}fipscanister.lib O_FIPSCANISTER=\$(FIPSLIB_D)${o}fipscanister.lib
FIPS_SHA1_EXE=\$(FIPSDIR)bin${o}fips_standalone_sha1${exep} FIPS_SHA1_EXE=\$(FIPSDIR)${o}bin${o}fips_standalone_sha1${exep}
E_PREMAIN_DSO=fips_premain_dso E_PREMAIN_DSO=fips_premain_dso
PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep
FIPSLINK=\$(PERL) \$(FIPSDIR)bin${o}fipslink.pl FIPSLINK=\$(PERL) \$(FIPSDIR)bin${o}fipslink.pl