mirror of
https://github.com/openssl/openssl.git
synced 2025-02-11 14:22:43 +08:00
Make Windows build work with GCM.
This commit is contained in:
parent
ed12c2f7ca
commit
dc527a62a1
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user