User cleaner way to handle new options for VC++ build.

1 files changed, 7 insertions, 10 deletions

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 0f94082bb5..19cb9591f9 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -365,7 +365,6 @@ for (;;)
 
 	if ($key eq "FIPS_EX_OBJ")
 		{ 
-		$val =~ s|\.\./crypto/||g;
 		$fips_ex_obj=&var_add("crypto",$val);
 		}
 
@@ -389,7 +388,7 @@ if ($fips)
 		$fips_exclude_obj{$1} = 1 if (/\/([^\/]*)$/);
 		}
 
-	# $fips_exclude_obj{"bn_asm"} = 1;
+	$fips_exclude_obj{"bn_asm"} = 1;
 
 	my @ltmp = split " ", $lib_obj{"CRYPTO"};
 
@@ -398,21 +397,19 @@ if ($fips)
 
 	foreach(@ltmp)
 		{
-		if (/\/bn_asm$/)
+		if (/\/([^\/]*)$/ && exists $fips_exclude_obj{$1})
 			{
-			$lib_obj{"FIPS"} .= "$_ ";
+			if ($fipscanisterbuild)
+				{
+				$lib_obj{"FIPS"} .= "$_ ";
+				}
 			}
-		elsif (!/\/([^\/]*)$/ || !exists $fips_exclude_obj{$1})
+		else
 			{
 			$lib_obj{"CRYPTO"} .= "$_ ";
 			}
 		}
 
-	if ($fipscanisterbuild)
-		{
-		$lib_obj{"FIPS"} .= $fips_ex_obj;
-		}
-
 	}
 
 if ($fipscanisterbuild)