diff --git a/sm4/gcm_amd64.s b/sm4/gcm_amd64.s index c980d44..e9e6997 100644 --- a/sm4/gcm_amd64.s +++ b/sm4/gcm_amd64.s @@ -344,8 +344,8 @@ TEXT ·gcmSm4Data(SB),NOSPLIT,$0 MOVQ data_len+16(FP), autLen MOVQ T+32(FP), tPtr - //PXOR ACC0, ACC0 - MOVOU (tPtr), ACC0 + PXOR ACC0, ACC0 + // MOVOU (tPtr), ACC0 // originally we passed in tag initial value MOVOU bswapMask<>(SB), BSWAP MOVOU gcmPoly<>(SB), POLY diff --git a/sm4/gcm_arm64.s b/sm4/gcm_arm64.s index 9a04ba5..a2ff78a 100644 --- a/sm4/gcm_arm64.s +++ b/sm4/gcm_arm64.s @@ -254,8 +254,8 @@ TEXT ·gcmSm4Data(SB),NOSPLIT,$0 MOVD data_len+16(FP), autLen MOVD T+32(FP), tPtr - //VEOR ACC0.B16, ACC0.B16, ACC0.B16 - VLD1 (tPtr), [ACC0.B16] + VEOR ACC0.B16, ACC0.B16, ACC0.B16 + //VLD1 (tPtr), [ACC0.B16] // originally we passed in tag initial value CBZ autLen, dataBail MOVD $0xC2, H0 diff --git a/sm4/sm4_gcm_test.go b/sm4/sm4_gcm_test.go deleted file mode 100644 index f2eb4d5..0000000 --- a/sm4/sm4_gcm_test.go +++ /dev/null @@ -1,258 +0,0 @@ -//go:build (amd64 && !generic) || (arm64 && !generic) -// +build amd64,!generic arm64,!generic - -package sm4 - -import ( - "encoding/hex" - "fmt" - "testing" -) - -func genPrecomputeTable() *gcmAsm { - key := []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10} - c := &sm4CipherAsm{sm4Cipher{make([]uint32, rounds), make([]uint32, rounds)}, 4, 64} - expandKey(key, c.enc, c.dec) - c1 := &sm4CipherGCM{c} - g := &gcmAsm{} - g.cipher = c1.sm4CipherAsm - gcmSm4InitInst(&g.bytesProductTable, g.cipher.enc) - return g -} - -/* -amd64 result = { - 0xEF, 0xE0, 0x28, 0x75, 0x21, 0x1F, 0x10, 0x4B, 0x6C, 0xC6, 0x39, 0x8A, 0x88, 0xE0, 0x26, 0x16, - 0x83, 0x26, 0x11, 0xFF, 0xA9, 0xFF, 0x36, 0x5D, 0x83, 0x26, 0x11, 0xFF, 0xA9, 0xFF, 0x36, 0x5D, - 0xD1, 0x99, 0x07, 0x39, 0xBA, 0x15, 0x68, 0xA7, 0xB8, 0x50, 0xC2, 0xB3, 0xD6, 0xFA, 0xA7, 0x02, - 0x69, 0xC9, 0xC5, 0x8A, 0x6C, 0xEF, 0xCF, 0xA5, 0x69, 0xC9, 0xC5, 0x8A, 0x6C, 0xEF, 0xCF, 0xA5, - 0xC4, 0x65, 0xCA, 0xCA, 0x55, 0x7F, 0x2B, 0x72, 0xB1, 0xA4, 0x14, 0x62, 0xDE, 0xBD, 0x1B, 0x00, - 0x75, 0xC1, 0xDE, 0xA8, 0x8B, 0xC2, 0x30, 0x72, 0x75, 0xC1, 0xDE, 0xA8, 0x8B, 0xC2, 0x30, 0x72, - 0x85, 0xF6, 0x58, 0x15, 0x09, 0x45, 0xB9, 0x72, 0x00, 0x30, 0xAB, 0x91, 0x2A, 0x73, 0xB7, 0x1C, - 0x85, 0xC6, 0xF3, 0x84, 0x23, 0x36, 0x0E, 0x6E, 0x85, 0xC6, 0xF3, 0x84, 0x23, 0x36, 0x0E, 0x6E, - 0x70, 0xD7, 0xD2, 0x6D, 0x60, 0xBA, 0x5E, 0x2E, 0x43, 0x4C, 0x4A, 0xCF, 0xFA, 0xE2, 0xF1, 0x5B, - 0x33, 0x9B, 0x98, 0xA2, 0x9A, 0x58, 0xAF, 0x75, 0x33, 0x9B, 0x98, 0xA2, 0x9A, 0x58, 0xAF, 0x75, - 0xED, 0xEB, 0x6C, 0xD4, 0x1B, 0x6C, 0x86, 0x6A, 0xA1, 0x16, 0xA5, 0xFF, 0x33, 0xDC, 0xBB, 0xC0, - 0x4C, 0xFD, 0xC9, 0x2B, 0x28, 0xB0, 0x3D, 0xAA, 0x4C, 0xFD, 0xC9, 0x2B, 0x28, 0xB0, 0x3D, 0xAA, - 0xBF, 0x7C, 0x2D, 0x4E, 0xFD, 0xDD, 0x55, 0x77, 0x1C, 0x7E, 0x73, 0xC7, 0xAA, 0x8B, 0x73, 0x2F, - 0xA3, 0x02, 0x5E, 0x89, 0x57, 0x56, 0x26, 0x58, 0xA3, 0x02, 0x5E, 0x89, 0x57, 0x56, 0x26, 0x58, - 0x54, 0x44, 0xA9, 0xB7, 0x20, 0x66, 0xAA, 0x2E, 0x99, 0x45, 0x82, 0x13, 0xD6, 0xE8, 0xEF, 0x4C, - 0xCD, 0x01, 0x2B, 0xA4, 0xF6, 0x8E, 0x45, 0x62, 0xCD, 0x01, 0x2B, 0xA4, 0xF6, 0x8E, 0x45, 0x62, } -arm64 result = { - 0x6C, 0xC6, 0x39, 0x8A, 0x88, 0xE0, 0x26, 0x16, 0xEF, 0xE0, 0x28, 0x75, 0x21, 0x1F, 0x10, 0x4B, - 0x83, 0x26, 0x11, 0xFF, 0xA9, 0xFF, 0x36, 0x5D, 0x83, 0x26, 0x11, 0xFF, 0xA9, 0xFF, 0x36, 0x5D, - 0xB8, 0x50, 0xC2, 0xB3, 0xD6, 0xFA, 0xA7, 0x02, 0xD1, 0x99, 0x07, 0x39, 0xBA, 0x15, 0x68, 0xA7, - 0x69, 0xC9, 0xC5, 0x8A, 0x6C, 0xEF, 0xCF, 0xA5, 0x69, 0xC9, 0xC5, 0x8A, 0x6C, 0xEF, 0xCF, 0xA5, - 0xB1, 0xA4, 0x14, 0x62, 0xDE, 0xBD, 0x1B, 0x00, 0xC4, 0x65, 0xCA, 0xCA, 0x55, 0x7F, 0x2B, 0x72, - 0x75, 0xC1, 0xDE, 0xA8, 0x8B, 0xC2, 0x30, 0x72, 0x75, 0xC1, 0xDE, 0xA8, 0x8B, 0xC2, 0x30, 0x72, - 0x00, 0x30, 0xAB, 0x91, 0x2A, 0x73, 0xB7, 0x1C, 0x85, 0xF6, 0x58, 0x15, 0x09, 0x45, 0xB9, 0x72, - 0x85, 0xC6, 0xF3, 0x84, 0x23, 0x36, 0x0E, 0x6E, 0x85, 0xC6, 0xF3, 0x84, 0x23, 0x36, 0x0E, 0x6E, - 0x43, 0x4C, 0x4A, 0xCF, 0xFA, 0xE2, 0xF1, 0x5B, 0x70, 0xD7, 0xD2, 0x6D, 0x60, 0xBA, 0x5E, 0x2E, - 0x33, 0x9B, 0x98, 0xA2, 0x9A, 0x58, 0xAF, 0x75, 0x33, 0x9B, 0x98, 0xA2, 0x9A, 0x58, 0xAF, 0x75, - 0xA1, 0x16, 0xA5, 0xFF, 0x33, 0xDC, 0xBB, 0xC0, 0xED, 0xEB, 0x6C, 0xD4, 0x1B, 0x6C, 0x86, 0x6A, - 0x4C, 0xFD, 0xC9, 0x2B, 0x28, 0xB0, 0x3D, 0xAA, 0x4C, 0xFD, 0xC9, 0x2B, 0x28, 0xB0, 0x3D, 0xAA, - 0x1C, 0x7E, 0x73, 0xC7, 0xAA, 0x8B, 0x73, 0x2F, 0xBF, 0x7C, 0x2D, 0x4E, 0xFD, 0xDD, 0x55, 0x77, - 0xA3, 0x02, 0x5E, 0x89, 0x57, 0x56, 0x26, 0x58, 0xA3, 0x02, 0x5E, 0x89, 0x57, 0x56, 0x26, 0x58, - 0x99, 0x45, 0x82, 0x13, 0xD6, 0xE8, 0xEF, 0x4C, 0x54, 0x44, 0xA9, 0xB7, 0x20, 0x66, 0xAA, 0x2E, - 0xCD, 0x01, 0x2B, 0xA4, 0xF6, 0x8E, 0x45, 0x62, 0xCD, 0x01, 0x2B, 0xA4, 0xF6, 0x8E, 0x45, 0x62, -} -*/ -func TestGcmSm4Init(t *testing.T) { - g := genPrecomputeTable() - for i := 0; i < 16; i++ { - for j := 0; j < 16; j++ { - fmt.Printf("0x%02X, ", g.bytesProductTable[i*16+j]) - } - fmt.Println() - } -} - -/* -amd64 result = { - 7D 13 81 A2 78 ED 2D 5E 91 3E 7F 9A 15 2C 76 DA -} - -arm64 result = { - 91 3E 7F 9A 15 2C 76 DA 7D 13 81 A2 78 ED 2D 5E -} -*/ -func TestGcmSm4Data(t *testing.T) { - g := genPrecomputeTable() - var counter [gcmBlockSize]byte - nonce := []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} - gcmSm4Data(&g.bytesProductTable, nonce, &counter) - for j := 0; j < 16; j++ { - fmt.Printf("%02X ", counter[j]) - } - fmt.Println() -} - -/* -amd64 result = { - 8F F3 05 10 EA 99 A8 D7 41 D9 E3 BA 67 D6 18 EE -} -arm64 result = { - 8F F3 05 10 EA 99 A8 D7 41 D9 E3 BA 67 D6 18 EE -} -*/ -func TestGcmSm4Finish(t *testing.T) { - g := genPrecomputeTable() - var counter, tagMask [gcmBlockSize]byte - nonce := []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} - gcmSm4Data(&g.bytesProductTable, nonce, &counter) - gcmSm4Finish(&g.bytesProductTable, &tagMask, &counter, uint64(len(nonce)), uint64(0)) - for j := 0; j < 16; j++ { - fmt.Printf("%02X ", counter[j]) - } - fmt.Println() -} - -/* -amd64 result= { -71 F0 B5 6E B6 6A 89 11 98 01 23 72 4B F6 0D 0C -5B 36 17 D5 95 7E B6 42 8C 6A C7 E1 80 76 70 B6 -16 3E 35 A0 B7 51 62 AA 1D AF C1 15 2D C4 3B 9D -} -arm64 result = { -98 01 23 72 4B F6 0D 0C 71 F0 B5 6E B6 6A 89 11 -8C 6A C7 E1 80 76 70 B6 5B 36 17 D5 95 7E B6 42 -16 3E 35 A0 B7 51 62 AA 1D AF C1 15 2D C4 3B 9D -} -*/ -func TestBothDataPlaintext(t *testing.T) { - g := genPrecomputeTable() - var tagOut, tagMask [gcmBlockSize]byte - data := []byte("emmansun") - gcmSm4Data(&g.bytesProductTable, data, &tagOut) - for j := 0; j < 16; j++ { - tagMask[j] = byte(j) - } - for j := 0; j < 16; j++ { - fmt.Printf("%02X ", tagOut[j]) - } - fmt.Println() - gcmSm4Data(&g.bytesProductTable, []byte("emmansunemmansunemmansunemmansun"), &tagOut) - for j := 0; j < 16; j++ { - fmt.Printf("%02X ", tagOut[j]) - } - fmt.Println() - gcmSm4Finish(&g.bytesProductTable, &tagMask, &tagOut, uint64(32), uint64(8)) - for j := 0; j < 16; j++ { - fmt.Printf("%02X ", tagOut[j]) - } - fmt.Println() -} - -func createGcm() *gcmAsm { - key := []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10} - c := &sm4CipherAsm{sm4Cipher{make([]uint32, rounds), make([]uint32, rounds)}, 4, 64} - expandKey(key, c.enc, c.dec) - c1 := &sm4CipherGCM{c} - g := &gcmAsm{} - g.cipher = c1.sm4CipherAsm - g.tagSize = 16 - gcmSm4InitInst(&g.bytesProductTable, g.cipher.enc) - return g -} - -var sm4GCMTests = []struct { - plaintext string -}{ - { // case 0: < 16 - "abcdefg", - }, - { // case 1: = 16 - "abcdefgabcdefghg", - }, - { // case 2: > 16 , < 64 - "abcdefgabcdefghgabcdefgabcdefghgaaa", - }, - { // case 3: = 64 - "abcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghg", - }, - { // case 4: > 64, < 128 - "abcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgaaa", - }, - { // case 5: = 128 - "abcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghg", - }, - { // case 6: 227 > 128, < 256, 128 + 64 + 35 - "abcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgaaa", - }, - { // case 7: = 256 - "abcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghg", - }, - { // case 8: > 256, = 355 - "abcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgabcdefgabcdefghgaaa", - }, -} - -func initCounter(i byte, counter *[16]byte) { - copy(counter[:], []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}) - counter[gcmBlockSize-1] = i -} - -func resetTag(tag *[16]byte) { - for j := 0; j < 16; j++ { - tag[j] = 0 - } -} - -func TestGcmSm4Enc(t *testing.T) { - var counter1, counter2 [16]byte - gcm := createGcm() - var tagOut1, tagOut2 [gcmTagSize]byte - - for i, test := range sm4GCMTests { - initCounter(2, &counter1) - initCounter(1, &counter2) - - gcmSm4Data(&gcm.bytesProductTable, []byte("emmansun"), &tagOut1) - out1 := make([]byte, len(test.plaintext)+gcm.tagSize) - gcm.counterCrypt(out1, []byte(test.plaintext), &counter1) - gcmSm4Data(&gcm.bytesProductTable, out1[:len(test.plaintext)], &tagOut1) - - out2 := make([]byte, len(test.plaintext)+gcm.tagSize) - gcmSm4Data(&gcm.bytesProductTable, []byte("emmansun"), &tagOut2) - gcmSm4EncInst(&gcm.bytesProductTable, out2, []byte(test.plaintext), &counter2, &tagOut2, gcm.cipher.enc) - if hex.EncodeToString(out1) != hex.EncodeToString(out2) { - t.Errorf("#%d: out expected %s, got %s", i, hex.EncodeToString(out1), hex.EncodeToString(out2)) - } - if hex.EncodeToString(tagOut1[:]) != hex.EncodeToString(tagOut2[:]) { - t.Errorf("#%d: tag expected %s, got %s", i, hex.EncodeToString(tagOut1[:]), hex.EncodeToString(tagOut2[:])) - } - resetTag(&tagOut1) - resetTag(&tagOut2) - } -} - -func TestGcmSm4Dec(t *testing.T) { - var counter1, counter2 [16]byte - gcm := createGcm() - var tagOut1, tagOut2 [gcmTagSize]byte - - for i, test := range sm4GCMTests { - initCounter(2, &counter1) - initCounter(1, &counter2) - - gcmSm4Data(&gcm.bytesProductTable, []byte("emmansun"), &tagOut1) - out1 := make([]byte, len(test.plaintext)+gcm.tagSize) - gcm.counterCrypt(out1, []byte(test.plaintext), &counter1) - gcmSm4Data(&gcm.bytesProductTable, out1[:len(test.plaintext)], &tagOut1) - - out1 = out1[:len(test.plaintext)] - - out2 := make([]byte, len(test.plaintext)+gcm.tagSize) - gcmSm4Data(&gcm.bytesProductTable, []byte("emmansun"), &tagOut2) - gcmSm4DecInst(&gcm.bytesProductTable, out2, out1, &counter2, &tagOut2, gcm.cipher.enc) - - if hex.EncodeToString([]byte(test.plaintext)) != hex.EncodeToString(out2[:len(test.plaintext)]) { - t.Errorf("#%d: out expected %s, got %s", i, hex.EncodeToString([]byte(test.plaintext)), hex.EncodeToString(out2[:len(test.plaintext)])) - } - if hex.EncodeToString(tagOut1[:]) != hex.EncodeToString(tagOut2[:]) { - t.Errorf("#%d: tag expected %s, got %s", i, hex.EncodeToString(tagOut1[:]), hex.EncodeToString(tagOut2[:])) - } - resetTag(&tagOut1) - resetTag(&tagOut2) - } -}