projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only call FIPS_cipherinit in FIPS mode
[oweals/openssl.git]
/
Configure
diff --git
a/Configure
b/Configure
index e658eb7cd97c2cc27e138105e8b4ff92ca752a07..cbbf4de8b25f19ba9020740748d36a5c66abf911 100755
(executable)
--- a/
Configure
+++ b/
Configure
@@
-904,11
+904,11
@@
PROCESS_ARGS:
}
elsif (/^--with-fipsdir=(.*)$/)
{
}
elsif (/^--with-fipsdir=(.*)$/)
{
- $fipsdir="$1
/
";
+ $fipsdir="$1";
}
elsif (/^--with-fipslibdir=(.*)$/)
{
}
elsif (/^--with-fipslibdir=(.*)$/)
{
- $fipslibdir="$1
/
";
+ $fipslibdir="$1";
}
elsif (/^--with-baseaddr=(.*)$/)
{
}
elsif (/^--with-baseaddr=(.*)$/)
{
@@
-1095,6
+1095,8
@@
foreach (sort (keys %disabled))
else
{
push @skip, $algo;
else
{
push @skip, $algo;
+ # fix-up crypto/directory name(s)
+ @skip[$#skip]="whrlpool" if $algo eq "whirlpool";
print " (skip dir)";
$depflags .= " -DOPENSSL_NO_$ALGO";
print " (skip dir)";
$depflags .= " -DOPENSSL_NO_$ALGO";
@@
-1391,14
+1393,6
@@
if (!$IsMK1MF)
}
}
}
}
-if (!defined($disabled{"sctp"}))
- {
- if ($target =~ /^solaris/)
- {
- $cflags = "$cflags -D_XPG4_2 -D__EXTENSIONS__";
- }
- }
-
$cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
#
$cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
#
@@
-1521,7
+1515,7
@@
else {
$aes_obj=$aes_enc;
}
$wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
$aes_obj=$aes_enc;
}
$wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
-if ($wp_obj =~ /\.o$/)
+if ($wp_obj =~ /\.o$/
&& !$disabled{"whirlpool"}
)
{
$cflags.=" -DWHIRLPOOL_ASM";
}
{
$cflags.=" -DWHIRLPOOL_ASM";
}