From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 18 Jun 2011 19:02:12 +0000 (+0000)
Subject: Don't add trailing slash to FIPSDIR: it causes problems with Windows builds.
X-Git-Tag: OpenSSL_1_0_1-beta1~234
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a18d5c89bc6c8b96a4c79f542e974a54148d257;p=oweals%2Fopenssl.git

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

diff --git a/Configure b/Configure
index 04278806eb..962a748033 100755
--- a/Configure
+++ b/Configure
@@ -674,7 +674,7 @@ my $fips=0;
 if (exists $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):
@@ -958,7 +958,7 @@ if (defined($disabled{"md5"}) || defined($disabled{"rsa"}))
 
 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
@@ -1422,7 +1422,7 @@ $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/);
 if ($fips)
 	{
 	$openssl_other_defines.="#define OPENSSL_FIPS\n";
-	$cflags .= " -I\$(FIPSDIR)include";
+	$cflags .= " -I\$(FIPSDIR)/include";
 	}
 
 $cpuid_obj="mem_clr.o"	unless ($cpuid_obj =~ /\.o$/);
diff --git a/Makefile.org b/Makefile.org
index e6a6597926..b66c6462e5 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -295,7 +295,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 		if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
 			FIPSLD_LIBCRYPTO=libcrypto.a ; \
-			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; \
+			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
 			export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
 		fi; \
 		$(MAKE) -e SHLIBDIRS=crypto build-shared; \
diff --git a/apps/Makefile b/apps/Makefile
index 658a09a2f2..4df7a3f03c 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -154,7 +154,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 		shlib_target="$(SHLIB_TARGET)"; \
 	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; \
 	LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \
diff --git a/test/Makefile b/test/Makefile
index be41c273e9..ebf0c2dbb6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -357,7 +357,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 	fi; \
 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
 	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; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \
 		CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 369c9fdd89..b1474cb6ac 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -59,7 +59,7 @@ while(<IN>) {
 }
 close(IN);
 
-$fipsdir =~ tr/\\/\//;
+$fipsdir =~ tr/\//${o}/;
 $debug = 1 if $mf_platform =~ /^debug-/;
 
 die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
@@ -483,10 +483,10 @@ ASM=$bin_dir$asm
 
 FIPSDIR=$fipsdir
 BASEADDR=$baseaddr
-FIPSLIB_D=\$(FIPSDIR)lib
+FIPSLIB_D=\$(FIPSDIR)${o}lib
 FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c
 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
 PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep
 FIPSLINK=\$(PERL) \$(FIPSDIR)bin${o}fipslink.pl