generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Engage GHASH for PowerISA 2.07."

Browse Source 
This reverts commit 14aaf883d9.
This commit is contained in:
Andy Polyakov
2014-07-16 13:37:37 +02:00
parent 14aaf883d9
commit 6cd13f70bb
4 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/modes/Makefile
View File

@@ -62,8 +62,6 @@ ghash-parisc.s: asm/ghash-parisc.pl
$(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
ghashv8-armx.S: asm/ghashv8-armx.pl
$(PERL) asm/ghashv8-armx.pl $(PERLASM_SCHEME) $@
ghashp8-ppc.s: asm/ghashp8-ppc.pl
$(PERL) asm/ghashp8-ppc.pl $(PERLASM_SCHEME) $@
# GNU make "catch all"
ghash-%.S: asm/ghash-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@

17
crypto/modes/gcm128.c
View File

@@ -700,13 +700,6 @@ extern unsigned int OPENSSL_sparcv9cap_P[];
void gcm_init_vis3(u128 Htable[16],const u64 Xi[2]);
void gcm_gmult_vis3(u64 Xi[2],const u128 Htable[16]);
void gcm_ghash_vis3(u64 Xi[2],const u128 Htable[16],const u8 *inp,size_t len);
#elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC))
# define GHASH_ASM_PPC
# define GCM_FUNCREF_4BIT
extern unsigned int OPENSSL_ppccap_P[];
void gcm_init_p8(u128 Htable[16],const u64 Xi[2]);
void gcm_gmult_p8(u64 Xi[2],const u128 Htable[16]);
void gcm_ghash_p8(u64 Xi[2],const u128 Htable[16],const u8 *inp,size_t len);
# endif
#endif
@@ -810,16 +803,6 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx,void *key,block128_f block)
ctx->gmult = gcm_gmult_4bit;
ctx->ghash = gcm_ghash_4bit;
}
# elif defined(GHASH_ASM_PPC)
if (OPENSSL_ppccap_P[0] & (1<<2)) {
gcm_init_p8(ctx->Htable,ctx->H.u);
ctx->gmult = gcm_gmult_p8;
ctx->ghash = gcm_ghash_p8;
} else {
gcm_init_4bit(ctx->Htable,ctx->H.u);
ctx->gmult = gcm_gmult_4bit;
ctx->ghash = gcm_ghash_4bit;
}
# else
gcm_init_4bit(ctx->Htable,ctx->H.u);
# endif