From dc527a62a11b1a9a4078f5b1d966b55310bf4a4c Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Fri, 11 Feb 2011 16:49:01 +0000
Subject: [PATCH] Make Windows build work with GCM.

---
 util/libeay.num  | 4 ++++
 util/mk1mf.pl    | 6 ++++--
 util/pl/VC-32.pl | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/util/libeay.num b/util/libeay.num
index cb013b4894..1a657bce2e 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4256,3 +4256,7 @@ fips_set_selftest_fail                  4626	EXIST:OPENSSL_FIPS:FUNCTION:
 fips_check_rsa                          4627	EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_check_incore_fingerprint           4628	EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_incore_fingerprint                 4629	EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_128_gcm                         4630	EXIST::FUNCTION:AES
+CRYPTO_gcm128_tag                       4631	EXIST::FUNCTION:
+EVP_aes_192_gcm                         4632	EXIST::FUNCTION:AES
+EVP_aes_256_gcm                         4633	EXIST::FUNCTION:AES
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 73bec13da7..b01acf2bbe 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -52,7 +52,8 @@ my %mf_import = (
 	SHA1_ASM_OBJ   => \$mf_sha_asm,
 	RMD160_ASM_OBJ => \$mf_rmd_asm,
 	WP_ASM_OBJ     => \$mf_wp_asm,
-	CMLL_ENC       => \$mf_cm_asm
+	CMLL_ENC       => \$mf_cm_asm,
+	MODES_ASM_OBJ  => \$mf_modes_asm
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -426,7 +427,8 @@ if ($fips)
 		$fips_exclude_obj{$1} = 1 if (/\/([^\/]*)$/);
 		}
 	foreach (split " ",
-		"$mf_cpuid_asm $mf_aes_asm $mf_sha_asm $mf_bn_asm $mf_des_asm")
+		"$mf_cpuid_asm $mf_aes_asm $mf_sha_asm $mf_bn_asm " .
+		"$mf_des_asm $mf_modes_asm")
 		{
 		s/\.o//;
 		$fips_exclude_obj{$_} = 1;
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index ce8cd733c7..76f85c3819 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -239,6 +239,7 @@ if (!$no_asm)
 	win32_import_asm($mf_sha_asm, "sha", \$sha1_asm_obj, \$sha1_asm_src);
 	win32_import_asm($mf_rmd_asm, "ripemd", \$rmd160_asm_obj, \$rmd160_asm_src);
 	win32_import_asm($mf_wp_asm, "whrlpool", \$whirlpool_asm_obj, \$whirlpool_asm_src);
+	win32_import_asm($mf_modes_asm, "modes", \$modes_asm_obj, \$modes_asm_src);
 	win32_import_asm($mf_cpuid_asm, "", \$cpuid_asm_obj, \$cpuid_asm_src);
 	$perl_asm = 1;
 	}
-- 
2.25.1