diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-06-15 15:40:03 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-06-15 15:40:03 +0000 |
| commit | 6fffeb46ad5f09089299bfa50e1efcacb4c6bf85 (patch) | |
| tree | 18525992d5228fa83bb91edd98cfd8465dddd8a0 | |
| parent | 48331e3f6437e110feb0e619fa7ff3df19c94545 (diff) | |
Add capi extra libs from stable branch. Don't touch fips directory if
not compiling in fips mode.
| -rwxr-xr-x | util/mk1mf.pl | 1 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 1 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 3718ea2625..bb1cfef6e2 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -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/) diff --git a/util/mkfiles.pl b/util/mkfiles.pl index b8ebb5cfa8..38d3e87377 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -57,6 +57,7 @@ my @dirs = ( "crypto/krb5", "crypto/store", "crypto/pqueue", +"crypto/cms", "fips", "fips/aes", "fips/des", diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index af3569cff3..c1987e8bd6 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -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/; |