UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: aesni - Move ghash_mul to GCM_COMPLETE 

Prepare to handle partial blocks between scatter/gather calls.
For the last partial block, we only want to calculate the aadhash
in GCM_COMPLETE, and a new partial block macro will handle both
aadhash update and encrypting partial blocks between calls.

Signed-off-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Dave Watson 2018-02-14 09:39:55 -08:00 committed by Herbert Xu
parent 9660474b0e
commit e2e34b0856
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/crypto/aesni-intel_asm.S
View File

@ -346,7 +346,6 @@ _zero_cipher_left_\@:
pxor %xmm0, %xmm8 pxor %xmm0, %xmm8
.endif .endif
GHASH_MUL %xmm8, %xmm13, %xmm9, %xmm10, %xmm11, %xmm5, %xmm6
movdqu %xmm8, AadHash(%arg2) movdqu %xmm8, AadHash(%arg2)
.ifc \operation, enc .ifc \operation, enc
# GHASH computation for the last <16 byte block # GHASH computation for the last <16 byte block
@ -379,6 +378,15 @@ _multiple_of_16_bytes_\@:
.macro GCM_COMPLETE .macro GCM_COMPLETE
movdqu AadHash(%arg2), %xmm8 movdqu AadHash(%arg2), %xmm8
movdqu HashKey(%rsp), %xmm13 movdqu HashKey(%rsp), %xmm13
mov PBlockLen(%arg2), %r12
cmp $0, %r12
je _partial_done\@
GHASH_MUL %xmm8, %xmm13, %xmm9, %xmm10, %xmm11, %xmm5, %xmm6
_partial_done\@:
mov AadLen(%arg2), %r12 # %r13 = aadLen (number of bytes) mov AadLen(%arg2), %r12 # %r13 = aadLen (number of bytes)
shl $3, %r12 # convert into number of bits shl $3, %r12 # convert into number of bits
movd %r12d, %xmm15 # len(A) in %xmm15 movd %r12d, %xmm15 # len(A) in %xmm15