mirror/gmsm
1
0
Fork 0
mirror of https://github.com/emmansun/gmsm.git synced 2025-04-27 04:36:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

zuc: reduce one XOR & rename one function

Browse Source
This commit is contained in:
Sun Yimin 2022-07-05 12:34:49 +08:00 committed by GitHub
parent 83c6a58365
commit 08d5d28bae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zuc/asm_amd64.s
View File

@ -40,8 +40,8 @@ DATA Aes_to_Zuc_mul_high_nibble<>+0x00(SB)/8, $0xA174A97CDD08D500
DATA Aes_to_Zuc_mul_high_nibble<>+0x08(SB)/8, $0x3DE835E04194499C
GLOBL Aes_to_Zuc_mul_high_nibble<>(SB), RODATA, $16
DATA Comb_matrix_mul_low_nibble<>+0x00(SB)/8, $0x9A8E3024EBFF4155
DATA Comb_matrix_mul_low_nibble<>+0x08(SB)/8, $0x2D3987935C48F6E2
DATA Comb_matrix_mul_low_nibble<>+0x00(SB)/8, $0xCFDB6571BEAA1400
DATA Comb_matrix_mul_low_nibble<>+0x08(SB)/8, $0x786CD2C6091DA3B7
GLOBL Comb_matrix_mul_low_nibble<>(SB), RODATA, $16
DATA Comb_matrix_mul_high_nibble<>+0x00(SB)/8, $0x638CFA1523CCBA55
@ -148,8 +148,7 @@ GLOBL flip_mask<>(SB), RODATA, $16
\
MOVOU Comb_matrix_mul_low_nibble<>(SB), XTMP1 \
MOVOU Comb_matrix_mul_high_nibble<>(SB), XIN_OUT \
MUL_PSHUFB_SSE(XTMP2, XTMP1, XIN_OUT, XTMP3) \
PXOR Const_comb_matrix<>(SB), XIN_OUT
MUL_PSHUFB_SSE(XTMP2, XTMP1, XIN_OUT, XTMP3)
#define Rotl_5_AVX(XDATA, XTMP0) \
@ -200,9 +199,7 @@ GLOBL flip_mask<>(SB), RODATA, $16
VAESENCLAST Cancel_aes<>(SB), XTMP2, XTMP2 \
VMOVDQU Comb_matrix_mul_low_nibble<>(SB), XTMP1 \
VMOVDQU Comb_matrix_mul_high_nibble<>(SB), XIN_OUT \
MUL_PSHUFB_AVX(XTMP2, XTMP1, XIN_OUT, XTMP3) \
VPXOR Const_comb_matrix<>(SB), XIN_OUT, XIN_OUT
MUL_PSHUFB_AVX(XTMP2, XTMP1, XIN_OUT, XTMP3)
// BITS_REORG(idx)
// params

2
zuc/eea.go
View File

@ -25,7 +25,7 @@ func NewEEACipher(key []byte, count, bearer, direction uint32) (cipher.Stream, e
return newZUCState(key, iv)
}
func genericXorKeyStream(c *zucState32, dst, src []byte) {
func xorKeyStreamGeneric(c *zucState32, dst, src []byte) {
words := (len(src) + 3) / 4
rounds := words / RoundWords
var keyWords [RoundWords]uint32

2
zuc/eea_asm.go
View File

@ -26,6 +26,6 @@ func xorKeyStream(c *zucState32, dst, src []byte) {
xor.XorBytes(dst[words*4:], src[words*4:], singleWord[:])
}
} else {
genericXorKeyStream(c, dst, src)
xorKeyStreamGeneric(c, dst, src)
}
}

2
zuc/eea_generic.go
View File

@ -4,5 +4,5 @@
package zuc
func xorKeyStream(c *zucState32, dst, src []byte) {
genericXorKeyStream(c, dst, src)
xorKeyStreamGeneric(c, dst, src)
}