yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove gcm_gmult_avx.

Browse Source 
`gcm_gmult_avx` is just a stub that jumps to `gmult_clmul`. Remove it
and replace the usages of it with calls to `gmult_clmul`.
This commit is contained in:
Brian Smith 2016-02-22 21:29:20 -10:00
parent 31d3209952
commit ee13e738a2
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/fipsmodule/modes/asm/ghash-x86_64.pl
View File

@ -570,7 +570,6 @@ $code.=<<___;
.type GFp_gcm_gmult_clmul,\@abi-omnipotent
.align 16
GFp_gcm_gmult_clmul:
.L_gmult_clmul:
movdqu ($Xip),$Xi
movdqa .Lbswap_mask(%rip),$T3
movdqu ($Htbl),$Hkey
@ -1111,15 +1110,6 @@ $code.=<<___;
.size GFp_gcm_init_avx,.-GFp_gcm_init_avx
___
}
$code.=<<___;
.globl GFp_gcm_gmult_avx
.type GFp_gcm_gmult_avx,\@abi-omnipotent
.align 32
GFp_gcm_gmult_avx:
jmp .L_gmult_clmul
.size GFp_gcm_gmult_avx,.-GFp_gcm_gmult_avx
___
$code.=<<___;
.globl GFp_gcm_ghash_avx

3
crypto/fipsmodule/modes/gcm.c
View File

@ -279,7 +279,6 @@ void GFp_gcm_ghash_clmul(uint8_t Xi[16], const u128 Htable[16],
#if defined(OPENSSL_X86_64)
#define GHASH_ASM_X86_64
void GFp_gcm_init_avx(u128 Htable[16], const uint64_t Xi[2]);
void GFp_gcm_gmult_avx(uint8_t Xi[16], const u128 Htable[16]);
void GFp_gcm_ghash_avx(uint8_t Xi[16], const u128 Htable[16], const uint8_t *in,
size_t len);
#define AESNI_GCM
@ -407,7 +406,7 @@ static void gcm128_init_gmult_ghash(GCM128_CONTEXT *ctx) {
if (GFp_gcm_clmul_enabled()) {
#if defined(GHASH_ASM_X86_64)
if (((GFp_ia32cap_P[1] >> 22) & 0x41) == 0x41) { // AVX+MOVBE
ctx->gmult = GFp_gcm_gmult_avx;
ctx->gmult = GFp_gcm_gmult_clmul;
ctx->ghash = GFp_gcm_ghash_avx;
ctx->use_aesni_gcm_crypt = hwaes_capable() ? 1 : 0;
return;