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

not compiling in fips mode.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 3718ea26251fc440938adb09106958bb47ae81f9..bb1cfef6e26f2a39a35098b08d6adc93a2622d45 100755 (executable)
--- 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 b8ebb5cfa83c577a58ab91c0790b8a2b75353295..38d3e87377a25a0713ed861f2cd437940bcf09a9 100755 (executable)
--- 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 af3569cff3824cf88a2abe3e1f18011b88a10260..c1987e8bd67eddcff66fa5d787d330767766cb1c 100644 (file)
--- 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/;