hex use of aes.

Author: scr-oath

crypto/api.go

@@ -28,6 +28,26 @@ func SHA256(L *lua.LState) int {
 
 // AESEncrypt implements AES encryption in Lua.
 func AESEncrypt(l *lua.LState) int {
+	modeStr := l.CheckString(1)
+	m, err := parseString(modeStr)
+	if err != nil {
+		l.ArgError(1, err.Error())
+	}
+	key := []byte(l.CheckString(2))
+	iv := []byte(l.CheckString(3))
+	data := []byte(l.CheckString(4))
+	enc, err := encryptAES(m, key, iv, data)
+	if err != nil {
+		l.Push(lua.LNil)
+		l.Push(lua.LString(fmt.Sprintf("failed to encrypt: %v", err)))
+		return 2
+	}
+	l.Push(lua.LString(enc))
+	return 1
+}
+
+// AESEncryptHex implements AES encryption in Lua.
+func AESEncryptHex(l *lua.LState) int {
 	m, key, iv, data, err := decodeParams(l)
 	if err != nil {
 		l.Push(lua.LNil)
@@ -47,6 +67,26 @@ func AESEncrypt(l *lua.LState) int {
 
 // AESDecrypt implement AES decryption in Lua.
 func AESDecrypt(l *lua.LState) int {
+	modeStr := l.CheckString(1)
+	m, err := parseString(modeStr)
+	if err != nil {
+		l.ArgError(1, err.Error())
+	}
+	key := []byte(l.CheckString(2))
+	iv := []byte(l.CheckString(3))
+	data := []byte(l.CheckString(4))
+	dec, err := decryptAES(m, key, iv, data)
+	if err != nil {
+		l.Push(lua.LNil)
+		l.Push(lua.LString(fmt.Sprintf("failed to decrypt: %v", err)))
+		return 2
+	}
+	l.Push(lua.LString(dec))
+	return 1
+}
+
+// AESDecryptHex implement AES decryption in Lua.
+func AESDecryptHex(l *lua.LState) int {
 	m, key, iv, data, err := decodeParams(l)
 	if err != nil {
 		l.Push(lua.LNil)

crypto/api_test.go

@@ -4,10 +4,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/vadv/gopher-lua-libs/hex"
 	"github.com/vadv/gopher-lua-libs/tests"
 )
 
 func TestApi(t *testing.T) {
-	preload := tests.SeveralPreloadFuncs(Preload)
+	preload := tests.SeveralPreloadFuncs(Preload, hex.Preload)
 	assert.NotZero(t, tests.RunLuaTestFile(t, preload, "./test/test_api.lua"))
 }

crypto/loader.go

@@ -19,8 +19,10 @@ func Loader(L *lua.LState) int {
 }
 
 var api = map[string]lua.LGFunction{
-	"md5":         MD5,
-	"sha256":      SHA256,
-	"aes_encrypt": AESEncrypt,
-	"aes_decrypt": AESDecrypt,
+	"md5":             MD5,
+	"sha256":          SHA256,
+	"aes_encrypt_hex": AESEncryptHex,
+	"aes_decrypt_hex": AESDecryptHex,
+	"aes_encrypt":     AESEncrypt,
+	"aes_decrypt":     AESDecrypt,
 }

crypto/test/test_api.lua

@@ -1,5 +1,7 @@
 local crypto = require("crypto")
 local assert = require 'assert'
+local hex = require 'hex'
+local require = require 'require'
 
 function TestMD5(t)
     local tests = {
@@ -39,7 +41,7 @@ function TestSha256(t)
     end
 end
 
-function TestAESEncrypt(t)
+function TestAESEncryptHex(t)
     local tests = {
         {
             data = "48656c6c6f207w76f726c64", -- "Hello world" in hex
@@ -82,12 +84,12 @@ function TestAESEncrypt(t)
             err = "failed to encrypt: incorrect GCM nonce size: 14, expected: 12",
         },
         {
-            data     = "48656c6c6f20776f726c64", -- "Hello world" in hex
-            mode     = "cbc",
-            key      = "86e15cbc1cbf510d8f2e51d4b63a2144",
-            init     = "068bb92e032884ba8b260fa7d3a80005",
+            data = "48656c6c6f20776f726c64", -- "Hello world" in hex
+            mode = "cbc",
+            key = "86e15cbc1cbf510d8f2e51d4b63a2144",
+            init = "068bb92e032884ba8b260fa7d3a80005",
             expected = "dfba6f71cce4d4b76be301b577d9f095",
-            err      = nil,
+            err = nil,
         },
         {
             data = "48656c6c6f20776f726c64", -- "Hello world" in hex
@@ -116,14 +118,14 @@ function TestAESEncrypt(t)
     }
     for _, tt in ipairs(tests) do
         t:Run("aes_encrypt in " .. tostring(tt.mode) .. " mode", function(t)
-            local got, err = crypto.aes_encrypt(tt.mode, tt.key, tt.init, tt.data)
+            local got, err = crypto.aes_encrypt_hex(tt.mode, tt.key, tt.init, tt.data)
             assert:Equal(t, tt.expected, got)
             assert:Equal(t, tt.err, err)
         end)
     end
 end
 
-function TestAESDecrypt(t)
+function TestAESDecryptHex(t)
     local tests = {
         {
             data = "7ec4e38508a26abf7b46e8dc90a7299d5144bcf045e460c3efwb3e",
@@ -176,9 +178,38 @@ function TestAESDecrypt(t)
     }
     for _, tt in ipairs(tests) do
         t:Run("aes_decrypt in " .. tostring(tt.mode) .. " mode", function(t)
-            local got, err = crypto.aes_decrypt(tt.mode, tt.key, tt.init, tt.data)
+            local got, err = crypto.aes_decrypt_hex(tt.mode, tt.key, tt.init, tt.data)
             assert:Equal(t, tt.expected, got)
             assert:Equal(t, tt.err, err)
         end)
     end
 end
+
+function TestAESEncrypt(t)
+    tests = {
+        {
+            data = "48656c6c6f20776f726c64",
+            mode = "cbc",
+            key = "86e15cbc1cbf510d8f2e51d4b63a2144",
+            init = "068bb92e032884ba8b260fa7d3a80005",
+            expected = "dfba6f71cce4d4b76be301b577d9f095",
+            wantErr = false,
+        },
+    }
+    for _, tt in ipairs(tests) do
+        local key, err = hex.decode_string(tt.key)
+        require:NoError(t, err)
+        local init, err = hex.decode_string(tt.init)
+        require:NoError(t, err)
+        local data, err = hex.decode_string(tt.data)
+        require:NoError(t, err)
+        local got, err = crypto.aes_encrypt(tt.mode, key, init, data)
+        if tt.wantErr then
+            require:Error(t, err)
+            return
+        end
+        require:NoError(t, err)
+        got = hex.encode_to_string(got)
+        assert:Equal(t, tt.err, err)
+    end
+end

tests/assertions.lua

@@ -152,7 +152,7 @@ function assertions:NoErrorf(t, err, fmt, ...)
     if not err then
         return true
     end
-    return self:Fail(t, string.format([[
+    return self:Failf(t, string.format([[
 
 Error:      	Received unexpected error:
                 %s