Fix AES decryption on ARM (#175)

* fix #174

Author: wangxiao1254

emp-tool/utils/block.h

@@ -10,7 +10,7 @@ inline __m128i _mm_aesimc_si128(__m128i a) {
 }
 inline __m128i _mm_aesdec_si128 (__m128i a, __m128i RoundKey)
 {
-    return vreinterpretq_m128i_u8(vaesimcq_u8(vaesdq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0)) ^ vreinterpretq_u8_m128i(RoundKey)));
+    return vreinterpretq_m128i_u8(vaesimcq_u8(vaesdq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0))) ^ vreinterpretq_u8_m128i(RoundKey));
 }
 
 inline __m128i _mm_aesdeclast_si128 (__m128i a, __m128i RoundKey)
@@ -70,7 +70,7 @@ inline std::ostream& operator<<(std::ostream& out, const block& blk) {
 	out << std::hex;
 	uint64_t* data = (uint64_t*)&blk;
 
-	out << std::setw(16) << std::setfill('0') << data[1]
+	out << std::setw(16) << std::setfill('0') << data[1] <<" "
 		<< std::setw(16) << std::setfill('0') << data[0];
 
 	out << std::dec << std::setw(0);

test/aes_opt.cpp

@@ -15,17 +15,25 @@ int main() {
 				error("AES test fail!");
 		}
 	}
-	cout <<"all tests pass!\n";
 
 	block key = makeBlock(0x0f0e0d0c0b0a0908, 0x0706050403020100);
 	block msg = makeBlock(0xffeeddccbbaa9988, 0x7766554433221100);
+	cout << "message:"<<msg<<endl;
 	block res = makeBlock(0x5ac5b47080b7cdd8, 0x30047b6ad8e0c469);//https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.197.pdf page 36
 	AES_KEY KEY[2];
 	AES_set_encrypt_key(key, KEY);
 	AES_ecb_encrypt_blks(&msg, 1, KEY);
 	if(!cmpBlock(&msg, &res, 1)) {
-		error("AES test vector fail!");
+		error("AES Enc test vector fail!");
+	}
+	cout << "ciphertext:"<<msg<<endl;
+	AES_set_decrypt_key(key, KEY);
+	AES_ecb_decrypt_blks(&msg, 1, KEY);
+	block original_msg = makeBlock(0xffeeddccbbaa9988, 0x7766554433221100);
+	if(!cmpBlock(&msg, &original_msg, 1)) {
+		error("AES Dec test vector fail!");
 	}
+	cout << "decrypted:"<<msg<<endl;
 
 	block msg2[2];
 	msg2[0] = msg2[1] = makeBlock(0xffeeddccbbaa9988, 0x7766554433221100);
@@ -42,7 +50,7 @@ int main() {
 		error("AES test vector fail!");
 	}
 
-
+	cout <<"all tests pass!\n";
 
 	return 0;
 }