diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-18 19:02:12 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-18 19:02:12 +0000 |
commit | 4a18d5c89bc6c8b96a4c79f542e974a54148d257 (patch) | |
tree | f9d40693f7bda92d7ebb0697f6659f5f38dac25f /Configure | |
parent | 174b26c497cc384041dfd1ecdbbc26334ea66fe8 (diff) |
Don't add trailing slash to FIPSDIR: it causes problems with Windows builds.
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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$/); |