AES-Ni patch to replace native Go

aes-patch.diff

---
 aesenc_amd64.s | 11 +++++++++++
 haraka.go      | 40 ++++------------------------------------
 2 files changed, 15 insertions(+), 36 deletions(-)
 create mode 100644 aesenc_amd64.s

diff --git a/aesenc_amd64.s b/aesenc_amd64.s
new file mode 100644
index 0000000..f377ad2
--- /dev/null
+++ b/aesenc_amd64.s
@@ -0,0 +1,11 @@
+
+// func _aesenc(k, s*byte)
+TEXT ·_aesenc(SB),$0
+    MOVQ k+0(FP), AX
+    MOVQ s+8(FP), BX
+    MOVUPS 0(AX), X1
+    MOVUPS 0(BX), X0
+    AESENC X1, X0
+    MOVUPS X0, 0(BX)
+    RET
+
diff --git a/haraka.go b/haraka.go
index e692db5..1924dd2 100644
--- a/haraka.go
+++ b/haraka.go
@@ -19,24 +19,6 @@ import (
 	"unsafe"
 )
 
-var sbox = [256]byte{
-	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
-	0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-	0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-	0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
-	0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
-	0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-	0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-	0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
-	0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
-	0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
-	0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-	0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16,
-}
 
 var rc = [48 * 4]uint32{
 	0x75817b9d, 0xb2c5fef0, 0xe620c00a, 0x0684704c, 0x2f08f717, 0x640f6ba4,
@@ -185,27 +167,13 @@ func _MIX4(tmp []uint32, s0, s1, s2, s3 []byte) {
 	s1Ptr[3] = tmp[1]
 }
 
-func aesenc(s, rk []byte) {
-	var v [4][4]byte
-	for i := 0; i < 16; i++ {
-		v[((i/4)+4-(i%4))%4][i%4] = sbox[s[i]]
-	}
+func _aesenc(k, s*byte)
 
-	var t byte
-	var u byte
-	for i := 0; i < 4; i++ {
-		t = v[i][0]
-		u = v[i][0] ^ v[i][1] ^ v[i][2] ^ v[i][3]
-		v[i][0] ^= u ^ _XT(v[i][0]^v[i][1])
-		v[i][1] ^= u ^ _XT(v[i][1]^v[i][2])
-		v[i][2] ^= u ^ _XT(v[i][2]^v[i][3])
-		v[i][3] ^= u ^ _XT(v[i][3]^t)
-	}
-	for i := 0; i < 16; i++ {
-		s[i] = v[i/4][i%4] ^ rk[i]
-	}
+func aesenc(k, s []byte) {
+    _aesenc( &k[0], &s[0] )
 }
 
+
 func haraka256(out, in []byte) {
 	if len(in) == 0 {
 		return

From 07acf5d576747a549037adf97d54dc78ce0649ad Mon Sep 17 00:00:00 2001
From: JP Aumasson <jeanphilippe.aumasson@gmail.com>
Date: Thu, 21 Sep 2017 11:10:51 +0200
Subject: [PATCH 2/2] bug fixed (reversed aesenc args order)

---
 haraka.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/haraka.go b/haraka.go
index 1924dd2..646f7fd 100644
--- a/haraka.go
+++ b/haraka.go
@@ -169,7 +169,8 @@ func _MIX4(tmp []uint32, s0, s1, s2, s3 []byte) {
 
 func _aesenc(k, s*byte)
 
-func aesenc(k, s []byte) {
+// mind the reversed arguments order
+func aesenc(s, k []byte) {
     _aesenc( &k[0], &s[0] )
 }
 
@@ -202,6 +203,7 @@ func haraka256(out, in []byte) {
 		out[i] = in[i] ^ s0[i]
 		out[i+16] = in[i+16] ^ s1[i]
 	}
+
 }
 
 func haraka512(out, in []byte) {
@@ -231,6 +233,7 @@ func haraka512(out, in []byte) {
 	_AES4(40, s0, s1, s2, s3)
 	_MIX4(tmp, s0, s1, s2, s3)
 
+
 	for i := 0; i < 16; i++ {
 		s0[i] = in[i] ^ s0[i]
 		s1[i] = in[i+16] ^ s1[i]