From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 13 Aug 2016 15:12:29 +0000 (+0100)
Subject: [Feature] Allow to create hashes from string in a single step
X-Git-Tag: 1.3.3~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=08dc3f907f279be6c38729fe0d09e43ae2cad358;p=rspamd.git

[Feature] Allow to create hashes from string in a single step
---

diff --git a/src/lua/lua_cryptobox.c b/src/lua/lua_cryptobox.c
index 65cb04174..49c58ecc8 100644
--- a/src/lua/lua_cryptobox.c
+++ b/src/lua/lua_cryptobox.c
@@ -591,7 +591,7 @@ lua_cryptobox_signature_gc (lua_State *L)
 }
 
 /***
- * @function rspamd_cryptobox_hash.create()
+ * @function rspamd_cryptobox_hash.create([string])
  * Creates new hash context
  * @param {string} data raw signature data
  * @return {cryptobox_hash} hash object
@@ -600,6 +600,8 @@ static gint
 lua_cryptobox_hash_create (lua_State *L)
 {
 	rspamd_cryptobox_hash_state_t *h, **ph;
+	const gchar *s;
+	gsize len;
 
 	h = g_slice_alloc (sizeof (*h));
 	rspamd_cryptobox_hash_init (h, NULL, 0);
@@ -607,11 +609,19 @@ lua_cryptobox_hash_create (lua_State *L)
 	*ph = h;
 	rspamd_lua_setclass (L, "rspamd{cryptobox_hash}", -1);
 
+	if (lua_type (L, 1) == LUA_TSTRING) {
+		s = lua_tolstring (L, 1, &len);
+
+		if (s) {
+			rspamd_cryptobox_hash_update (h, s, len);
+		}
+	}
+
 	return 1;
 }
 
 /***
- * @function rspamd_cryptobox_hash.create_keyed(key)
+ * @function rspamd_cryptobox_hash.create_keyed(key, [string])
  * Creates new hash context with specified key
  * @param {string} key key
  * @return {cryptobox_hash} hash object
@@ -620,7 +630,8 @@ static gint
 lua_cryptobox_hash_create_keyed (lua_State *L)
 {
 	rspamd_cryptobox_hash_state_t *h, **ph;
-	const gchar *key;
+	const gchar *key, *s;
+	gsize len;
 	gsize keylen;
 
 	key = luaL_checklstring (L, 1, &keylen);
@@ -631,6 +642,14 @@ lua_cryptobox_hash_create_keyed (lua_State *L)
 		ph = lua_newuserdata (L, sizeof (void *));
 		*ph = h;
 		rspamd_lua_setclass (L, "rspamd{cryptobox_hash}", -1);
+
+		if (lua_type (L, 2) == LUA_TSTRING) {
+			s = lua_tolstring (L, 2, &len);
+
+			if (s) {
+				rspamd_cryptobox_hash_update (h, s, len);
+			}
+		}
 	}
 	else {
 		return luaL_error (L, "invalid arguments");