Commit 6fffeb46 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

not compiling in fips mode.
parent 48331e3f

util/mk1mf.pl

+1 −0
Original line number Diff line number Diff line
@@ -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/)

util/mkfiles.pl

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ my @dirs = ( 
"crypto/krb5",

"crypto/store",

"crypto/pqueue",

"crypto/cms",

"fips",

"fips/aes",

"fips/des",

util/pl/VC-32.pl

+5 −0
Original line number Diff line number Diff line
@@ -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/;