aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--spec/util_hashes_spec.lua15
-rw-r--r--teal-src/util/hashes.d.tl4
-rw-r--r--util-src/hashes.c19
3 files changed, 38 insertions, 0 deletions
diff --git a/spec/util_hashes_spec.lua b/spec/util_hashes_spec.lua
index 51a4a79c..b3b81467 100644
--- a/spec/util_hashes_spec.lua
+++ b/spec/util_hashes_spec.lua
@@ -53,3 +53,18 @@ describe("PBKDF2-HMAC-SHA256", function ()
end);
+describe("SHA-3", function ()
+ describe("256", function ()
+ it("works", function ()
+ local expected = "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a"
+ assert.equal(expected, hashes.sha3_256("", true));
+ end);
+ end);
+ describe("512", function ()
+ it("works", function ()
+ local expected = "a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26"
+ assert.equal(expected, hashes.sha3_512("", true));
+ end);
+ end);
+end);
+
diff --git a/teal-src/util/hashes.d.tl b/teal-src/util/hashes.d.tl
index 6932ab72..5c249627 100644
--- a/teal-src/util/hashes.d.tl
+++ b/teal-src/util/hashes.d.tl
@@ -9,6 +9,8 @@ local record lib
sha384 : hash
sha512 : hash
md5 : hash
+ sha3_256 : hash
+ sha3_512 : hash
blake2s256 : hash
blake2b512 : hash
hmac_sha1 : hmac
@@ -17,6 +19,8 @@ local record lib
hmac_sha384 :hmac
hmac_sha512 : hmac
hmac_md5 : hmac
+ hmac_sha3_256 : hmac
+ hmac_sha3_512 : hmac
scram_Hi_sha1 : kdf
pbkdf2_hmac_sha1 : kdf
pbkdf2_hmac_sha256 : kdf
diff --git a/util-src/hashes.c b/util-src/hashes.c
index 2696f177..1b3e157d 100644
--- a/util-src/hashes.c
+++ b/util-src/hashes.c
@@ -120,6 +120,13 @@ static int Lblake2b512(lua_State *L) {
return Levp_hash(L, EVP_blake2b512());
}
+static int Lsha3_256(lua_State *L) {
+ return Levp_hash(L, EVP_sha3_256());
+}
+
+static int Lsha3_512(lua_State *L) {
+ return Levp_hash(L, EVP_sha3_512());
+}
struct hash_desc {
int (*Init)(void *);
@@ -198,6 +205,14 @@ static int Lhmac_md5(lua_State *L) {
return Levp_hmac(L, EVP_md5());
}
+static int Lhmac_sha3_256(lua_State *L) {
+ return Levp_hmac(L, EVP_sha3_256());
+}
+
+static int Lhmac_sha3_512(lua_State *L) {
+ return Levp_hmac(L, EVP_sha3_512());
+}
+
static int Lhmac_blake2s256(lua_State *L) {
return Levp_hmac(L, EVP_blake2s256());
}
@@ -251,6 +266,8 @@ static const luaL_Reg Reg[] = {
{ "sha384", Lsha384 },
{ "sha512", Lsha512 },
{ "md5", Lmd5 },
+ { "sha3_256", Lsha3_256 },
+ { "sha3_512", Lsha3_512 },
{ "blake2s256", Lblake2s256 },
{ "blake2b512", Lblake2b512 },
{ "hmac_sha1", Lhmac_sha1 },
@@ -259,6 +276,8 @@ static const luaL_Reg Reg[] = {
{ "hmac_sha384", Lhmac_sha384 },
{ "hmac_sha512", Lhmac_sha512 },
{ "hmac_md5", Lhmac_md5 },
+ { "hmac_sha3_256", Lhmac_sha3_256 },
+ { "hmac_sha3_512", Lhmac_sha3_512 },
{ "hmac_blake2s256", Lhmac_blake2s256 },
{ "hmac_blake2b512", Lhmac_blake2b512 },
{ "scram_Hi_sha1", Lpbkdf2_sha1 }, /* COMPAT */