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

Enable NEON fallback implementation of GCM on AAarch64.

Browse Source
This commit is contained in:
Brian Smith 2019-07-01 16:50:07 -10:00
parent 9a99848d74
commit b3f9a918e5
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl
View File

@ -157,10 +157,10 @@ ___
$code .= <<___;
.text
.global gcm_init_neon
.type gcm_init_neon,%function
.global GFp_gcm_init_neon
.type GFp_gcm_init_neon,%function
.align 4
gcm_init_neon:
GFp_gcm_init_neon:
// This function is adapted from gcm_init_v8. xC2 is t3.
ld1 {$t1.2d}, [x1] // load H
movi $t3.16b, #0xe1
@ -179,12 +179,12 @@ gcm_init_neon:
eor $Hlo.16b, $INlo.16b, $t0.16b // twisted H
st1 {$Hlo.2d}, [x0] // store Htable[0]
ret
.size gcm_init_neon,.-gcm_init_neon
.size GFp_gcm_init_neon,.-GFp_gcm_init_neon
.global gcm_gmult_neon
.type gcm_gmult_neon,%function
.global GFp_gcm_gmult_neon
.type GFp_gcm_gmult_neon,%function
.align 4
gcm_gmult_neon:
GFp_gcm_gmult_neon:
ld1 {$INlo.16b}, [$Xi] // load Xi
ld1 {$Hlo.1d}, [$Htbl], #8 // load twisted H
ld1 {$Hhi.1d}, [$Htbl]
@ -197,12 +197,12 @@ gcm_gmult_neon:
mov $len, #16
b .Lgmult_neon
.size gcm_gmult_neon,.-gcm_gmult_neon
.size GFp_gcm_gmult_neon,.-GFp_gcm_gmult_neon
.global gcm_ghash_neon
.type gcm_ghash_neon,%function
.global GFp_gcm_ghash_neon
.type GFp_gcm_ghash_neon,%function
.align 4
gcm_ghash_neon:
GFp_gcm_ghash_neon:
ld1 {$Xl.16b}, [$Xi] // load Xi
ld1 {$Hlo.1d}, [$Htbl], #8 // load twisted H
ld1 {$Hhi.1d}, [$Htbl]
@ -266,7 +266,7 @@ $code .= <<___;
st1 {$Xl.16b}, [$Xi]
ret
.size gcm_ghash_neon,.-gcm_ghash_neon
.size GFp_gcm_ghash_neon,.-GFp_gcm_ghash_neon
.section .rodata
.align 4

18
src/aead/gcm.rs
View File

@ -46,7 +46,7 @@ impl Key {
}
}
#[cfg(any(target_arch = "arm"))]
#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
Implementation::NEON => {
extern "C" {
fn GFp_gcm_init_neon(key: &mut Key, h: &[u64; 2]);
@ -56,6 +56,7 @@ impl Key {
}
}
#[cfg(not(target_arch = "aarch64"))]
Implementation::Fallback => {
extern "C" {
fn GFp_gcm_init_4bit(key: &mut Key, h: &[u64; 2]);
@ -132,7 +133,7 @@ impl Context {
}
}
#[cfg(any(target_arch = "arm"))]
#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
Implementation::NEON => {
extern "C" {
fn GFp_gcm_ghash_neon(
@ -147,6 +148,7 @@ impl Context {
}
}
#[cfg(not(target_arch = "aarch64"))]
Implementation::Fallback => {
extern "C" {
fn GFp_gcm_ghash_4bit(
@ -178,7 +180,7 @@ impl Context {
}
}
#[cfg(any(target_arch = "arm"))]
#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
Implementation::NEON => {
extern "C" {
fn GFp_gcm_gmult_neon(ctx: &mut Context, Htable: *const GCM128_KEY);
@ -188,6 +190,7 @@ impl Context {
}
}
#[cfg(not(target_arch = "aarch64"))]
Implementation::Fallback => {
extern "C" {
fn GFp_gcm_gmult_4bit(ctx: &mut Context, Htable: *const GCM128_KEY);
@ -242,9 +245,10 @@ struct GCM128_CONTEXT {
enum Implementation {
CLMUL,
#[cfg(target_arch = "arm")]
#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
NEON,
#[cfg(not(target_arch = "aarch64"))]
Fallback,
}
@ -263,6 +267,12 @@ fn detect_implementation(cpu: cpu::Features) -> Implementation {
}
}
#[cfg(target_arch = "aarch64")]
{
return Implementation::NEON;
}
#[cfg(not(target_arch = "aarch64"))]
Implementation::Fallback
}