Added sbox_1word_gpr() to vpsm4_ex-armv8.pl. Enabled checking for Neon+AES in test.

Author: yapolyak

crypto/sm4/asm/vpsm4-armv8.pl

@@ -288,8 +288,6 @@ ()
 	eor	$tmpw,$word2,$word3
 	eor	$wtmp2,$wtmp0,$word1
 	eor	$tmpw,$tmpw,$wtmp2
-	// Pre-load next round keys
-	//ldp	w16,w17,[$kptr],8
 ___
 	&sbox_1word_gpr($tmpw);
 $code.=<<___;
@@ -306,7 +304,6 @@ ()
 	// B2 ^= SBOX(B0 ^ B1 ^ B3 ^ RK2)
 	eor	$tmpw,$word0,$word1
 	eor	$wtmp2,$wtmp0,$word3
-	//eor	$wtmp2,w16,$word3
 	eor	$tmpw,$tmpw,$wtmp2
 ___
 	&sbox_1word_gpr($tmpw);
@@ -315,7 +312,6 @@ ()
 	// B3 ^= SBOX(B0 ^ B1 ^ B2 ^ RK3)
 	eor	$tmpw,$word0,$word1
 	eor	$wtmp2,$word2,$wtmp1
-	//eor	$wtmp2,$word2,w17
 	eor	$tmpw,$tmpw,$wtmp2
 ___
 	&sbox_1word_gpr($tmpw);

crypto/sm4/asm/vpsm4_ex-armv8.pl

@@ -226,6 +226,7 @@ ()
 }
 
 # sbox operation for one single word
+# This is very slow - using sbox_1word_gpr instead!
 sub sbox_1word () {
 	my $word = shift;
 
@@ -250,6 +251,35 @@ ()
 ___
 }
 
+sub sbox_1word_gpr () {
+    my $word = shift;
+    my ($ptr, $byte0, $byte1, $byte2) = ("x7", "w9", "w16", "w17");
+
+$code.=<<___;
+    // Get the base address of the S-Box lookup table
+    adrp    $ptr, .Lsbox
+    add     $ptr, $ptr, #:lo12:.Lsbox
+
+    // Extract each byte from the 32-bit input word, look it up, and reassemble
+    and     $byte0, $word, #0xff
+	ubfx    $byte1, $word, #8, #8
+	ubfx    $byte2, $word, #16, #8
+    ldrb    $byte0, [$ptr, x9]
+    ldrb    $byte1, [$ptr, x16]
+    ldrb    $byte2, [$ptr, x17]
+    orr     $byte0, $byte0, $byte1, lsl #8
+    lsr     $byte1, $word, #24
+    orr     $byte0, $byte0, $byte2, lsl #16
+    ldrb    $byte1, [$ptr, x16]
+    orr     $byte0, $byte0, $byte1, lsl #24
+
+	eor	$word,$byte0,$byte0,ror #32-2
+	eor	$word,$word,$byte0,ror #32-10
+	eor	$word,$word,$byte0,ror #32-18
+	eor	$word,$word,$byte0,ror #32-24
+___
+}
+
 # sm4 for one block of data, in scalar registers word0/word1/word2/word3
 sub sm4_1blk () {
 	my $kptr = shift;
@@ -260,37 +290,33 @@ ()
 	eor	$tmpw,$word2,$word3
 	eor	$wtmp2,$wtmp0,$word1
 	eor	$tmpw,$tmpw,$wtmp2
-	// Pre-load next round keys
-	ldp	w16,w17,[$kptr],8
 ___
-	&sbox_1word($tmpw);
+	&sbox_1word_gpr($tmpw);
 $code.=<<___;
 	eor	$word0,$word0,$tmpw
 	// B1 ^= SBOX(B0 ^ B2 ^ B3 ^ RK1)
 	eor	$tmpw,$word2,$word3
 	eor	$wtmp2,$word0,$wtmp1
 	eor	$tmpw,$tmpw,$wtmp2
 ___
-	&sbox_1word($tmpw);
+	&sbox_1word_gpr($tmpw);
 $code.=<<___;
-	//ldp	$wtmp0,$wtmp1,[$kptr],8
+	ldp	$wtmp0,$wtmp1,[$kptr],8
 	eor	$word1,$word1,$tmpw
 	// B2 ^= SBOX(B0 ^ B1 ^ B3 ^ RK2)
 	eor	$tmpw,$word0,$word1
-	//eor	$wtmp2,$wtmp0,$word3
-	eor	$wtmp2,w16,$word3
+	eor	$wtmp2,$wtmp0,$word3
 	eor	$tmpw,$tmpw,$wtmp2
 ___
-	&sbox_1word($tmpw);
+	&sbox_1word_gpr($tmpw);
 $code.=<<___;
 	eor	$word2,$word2,$tmpw
 	// B3 ^= SBOX(B0 ^ B1 ^ B2 ^ RK3)
 	eor	$tmpw,$word0,$word1
-	//eor	$wtmp2,$word2,$wtmp1
-	eor	$wtmp2,$word2,w17
+	eor	$wtmp2,$word2,$wtmp1
 	eor	$tmpw,$tmpw,$wtmp2
 ___
-	&sbox_1word($tmpw);
+	&sbox_1word_gpr($tmpw);
 $code.=<<___;
 	eor	$word3,$word3,$tmpw
 ___
@@ -549,6 +575,23 @@ ()
 .type	_${prefix}_consts,%object
 .align	7
 _${prefix}_consts:
+.Lsbox:
+	.byte 0xD6,0x90,0xE9,0xFE,0xCC,0xE1,0x3D,0xB7,0x16,0xB6,0x14,0xC2,0x28,0xFB,0x2C,0x05
+	.byte 0x2B,0x67,0x9A,0x76,0x2A,0xBE,0x04,0xC3,0xAA,0x44,0x13,0x26,0x49,0x86,0x06,0x99
+	.byte 0x9C,0x42,0x50,0xF4,0x91,0xEF,0x98,0x7A,0x33,0x54,0x0B,0x43,0xED,0xCF,0xAC,0x62
+	.byte 0xE4,0xB3,0x1C,0xA9,0xC9,0x08,0xE8,0x95,0x80,0xDF,0x94,0xFA,0x75,0x8F,0x3F,0xA6
+	.byte 0x47,0x07,0xA7,0xFC,0xF3,0x73,0x17,0xBA,0x83,0x59,0x3C,0x19,0xE6,0x85,0x4F,0xA8
+	.byte 0x68,0x6B,0x81,0xB2,0x71,0x64,0xDA,0x8B,0xF8,0xEB,0x0F,0x4B,0x70,0x56,0x9D,0x35
+	.byte 0x1E,0x24,0x0E,0x5E,0x63,0x58,0xD1,0xA2,0x25,0x22,0x7C,0x3B,0x01,0x21,0x78,0x87
+	.byte 0xD4,0x00,0x46,0x57,0x9F,0xD3,0x27,0x52,0x4C,0x36,0x02,0xE7,0xA0,0xC4,0xC8,0x9E
+	.byte 0xEA,0xBF,0x8A,0xD2,0x40,0xC7,0x38,0xB5,0xA3,0xF7,0xF2,0xCE,0xF9,0x61,0x15,0xA1
+	.byte 0xE0,0xAE,0x5D,0xA4,0x9B,0x34,0x1A,0x55,0xAD,0x93,0x32,0x30,0xF5,0x8C,0xB1,0xE3
+	.byte 0x1D,0xF6,0xE2,0x2E,0x82,0x66,0xCA,0x60,0xC0,0x29,0x23,0xAB,0x0D,0x53,0x4E,0x6F
+	.byte 0xD5,0xDB,0x37,0x45,0xDE,0xFD,0x8E,0x2F,0x03,0xFF,0x6A,0x72,0x6D,0x6C,0x5B,0x51
+	.byte 0x8D,0x1B,0xAF,0x92,0xBB,0xDD,0xBC,0x7F,0x11,0xD9,0x5C,0x41,0x1F,0x10,0x5A,0xD8
+	.byte 0x0A,0xC1,0x31,0x88,0xA5,0xCD,0x7B,0xBD,0x2D,0x74,0xD0,0x12,0xB8,0xE5,0xB4,0xB0
+	.byte 0x89,0x69,0x97,0x4A,0x0C,0x96,0x77,0x7E,0x65,0xB9,0xF1,0x09,0xC5,0x6E,0xC6,0x84
+	.byte 0x18,0xF0,0x7D,0xEC,0x3A,0xDC,0x4D,0x20,0x79,0xEE,0x5F,0x3E,0xD7,0xCB,0x39,0x48
 .Lck:
 	.long 0x00070E15, 0x1C232A31, 0x383F464D, 0x545B6269
 	.long 0x70777E85, 0x8C939AA1, 0xA8AFB6BD, 0xC4CBD2D9

test/sm4_internal_test.c

@@ -169,12 +169,12 @@ static int test_sm4_cbc(void)
     /* --- Test Encryption --- */
     ossl_sm4_set_key(key_bytes, &key);
     memcpy(iv, iv_bytes, SM4_BLOCK_SIZE); /* Use a working copy of the IV */
-//#if defined(VPSM4_EX_CAPABLE)
-//    if (vpsm4_ex_capable()) {
-//        vpsm4_ex_cbc_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
-//                             SM4_ENCRYPT);
-//    } else
-//#endif
+#if defined(VPSM4_EX_CAPABLE)
+    if (vpsm4_ex_capable()) {
+        vpsm4_ex_cbc_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
+                             SM4_ENCRYPT);
+    } else
+#endif
 #if defined(VPSM4_CAPABLE)
     if (vpsm4_capable()) {
         vpsm4_cbc_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
@@ -192,13 +192,13 @@ static int test_sm4_cbc(void)
 
     /* --- Test Decryption --- */
     memcpy(iv, iv_bytes, SM4_BLOCK_SIZE); /* Reset IV for decryption */
-//#if defined(VPSM4_EX_CAPABLE)
-//    if (vpsm4_ex_capable()) {
-//	    vpsm4_ex_set_decrypt_key(key_bytes, &key);
-//        vpsm4_ex_cbc_encrypt(ciphertext, decrypted, sizeof(ciphertext), &key, iv,
-//                             SM4_DECRYPT);
-//    } else
-//#endif
+#if defined(VPSM4_EX_CAPABLE)
+    if (vpsm4_ex_capable()) {
+	    vpsm4_ex_set_decrypt_key(key_bytes, &key);
+        vpsm4_ex_cbc_encrypt(ciphertext, decrypted, sizeof(ciphertext), &key, iv,
+                             SM4_DECRYPT);
+    } else
+#endif
 #if defined(VPSM4_CAPABLE)
     if (vpsm4_capable()) {
 	    vpsm4_set_decrypt_key(key_bytes, &key);