wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add capi extra libs from stable branch. Don't touch fips directory if

Browse source 
not compiling in fips mode.
This commit is contained in:
Dr. Stephen Henson 2008-06-15 15:40:03 +00:00
parent 48331e3f64
commit 6fffeb46ad
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
util/mk1mf.pl
View file

@ -1023,6 +1023,7 @@ sub var_add
return("") if $no_dh && $dir =~ /\/dh/;
return("") if $no_ec && $dir =~ /\/ec/;
return("") if $no_cms && $dir =~ /\/cms/;
return("") if !$fips && $dir =~ /^fips/;
if ($no_des && $dir =~ /\/des/)
{
if ($val =~ /read_pwd/)

1
util/mkfiles.pl
View file

@ -57,6 +57,7 @@ my @dirs = (
"crypto/krb5",
"crypto/store",
"crypto/pqueue",
"crypto/cms",
"fips",
"fips/aes",
"fips/des",

5
util/pl/VC-32.pl
View file

@ -332,6 +332,10 @@ sub do_lib_rule
if ($name eq "")
{
$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
if ($target =~ /capi/)
{
$ex.=' crypt32.lib advapi32.lib';
}
}
elsif ($FLAVOR =~ /CE/)
{
@ -341,6 +345,7 @@ sub do_lib_rule
{
$ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
$ex.=' crypt32.lib';
$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
}
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;