aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/crypto.md4
-rw-r--r--src/crypto.h4
-rw-r--r--src/hash/md5.c2
-rw-r--r--src/hash/sha01.c244
-rw-r--r--src/hash/sha01.h7
5 files changed, 181 insertions, 80 deletions
diff --git a/docs/crypto.md b/docs/crypto.md
index 0c9efbd..82d9e4e 100644
--- a/docs/crypto.md
+++ b/docs/crypto.md
@@ -15,8 +15,8 @@ remaining to fix (inc. variants): 15
|--|--|--|--|--|
| adler32 | 32 | nil | | y |
| bsdchecksum | 16 | nil | | y |
-| sha0 | 160 | nil | insecure, use sha1| todo |
-| sha1 | 160 | nil | | todo |
+| sha0 | 160 | nil | insecure, use sha1| y |
+| sha1 | 160 | nil | | y |
| sha256 | 256 | nil | | todo |
| sha224 | 224 | nil | | todo |
| pearson | 8 | nil | use setpearson(table) to change the table, initial is 0..255| y |
diff --git a/src/crypto.h b/src/crypto.h
index ec6b83b..5a93cb6 100644
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -92,7 +92,7 @@ int l_##luaname##_update(lua_State* L){\
}
static const luaL_Reg crypto_function_list [] = {
- {"sha0",l_sha0}, {"sha1",l_sha1}, {"sha256",l_sha256}, {"sha224",l_sha224},
+ {"sha256",l_sha256}, {"sha224",l_sha224},
{"setpearson",l_setpearson}, {"xxh64",l_xxh64},
{"xxh32",l_xxh32}, {"fletcher8",l_fletcher8},
{"fletcher16",l_fletcher16}, {"fletcher32",l_fletcher32},
@@ -133,6 +133,8 @@ static const luaL_Reg crypto_function_list [] = {
{"sysvchecksum",l_sysvchecksum}, {"sysvchecksum_init",l_sysvchecksum_init}, {"sysvchecksum_update",l_sysvchecksum_update}, {"sysvchecksum_final",l_sysvchecksum_final},
{"xor8",l_xor8}, {"xor8_init",l_xor8_init}, {"xor8_update",l_xor8_update}, {"xor8_final",l_xor8_final},
{"md5",l_md5}, {"md5_init",l_md5_init}, {"md5_update",l_md5_update}, {"md5_final",l_md5_final},
+ {"sha0",l_sha0}, {"sha0_init",l_sha0_init}, {"sha0_update",l_sha0_update}, {"sha0_final",l_sha0_final},
+ {"sha1",l_sha1}, {"sha1_init",l_sha1_init}, {"sha1_update",l_sha1_update}, {"sha1_final",l_sha1_final},
{"uuencode",l_uuencode},
{"uudecode",l_uudecode},
diff --git a/src/hash/md5.c b/src/hash/md5.c
index 8e02505..f8dec6f 100644
--- a/src/hash/md5.c
+++ b/src/hash/md5.c
@@ -98,7 +98,7 @@ void md5_update(uint8_t* input, size_t len, struct md5_hash* hash){
void md5_final(struct md5_hash* hash, char out_stream[64]){
hash->buffer[hash->bufflen] = 0x80;
- if(hash->bufflen > 56) {
+ if(hash->bufflen > 55) {
//too large, needs another buffer
md5_round(hash);
}
diff --git a/src/hash/sha01.c b/src/hash/sha01.c
index 87b9273..81a19d6 100644
--- a/src/hash/sha01.c
+++ b/src/hash/sha01.c
@@ -3,107 +3,199 @@
#include <string.h>
#include <stdint.h>
-void i_sha01(uint8_t version, char* out_stream, int len, const char* input){
- if(!out_stream||version > 2) return;
- uint32_t h0 = 0x67452301;
- uint32_t h1 = 0xEFCDAB89;
- uint32_t h2 = 0x98BADCFE;
- uint32_t h3 = 0x10325476;
- uint32_t h4 = 0xC3D2E1F0;
-
- int tlen = ((((len + 8) /64) + 1) * 64) - 8;
-
- uint8_t* by = NULL;
- by = calloc(tlen * 80 + 64, 1);
-
- memcpy(by, input, len);
- by[len] = 0x80;
-
- size_t blen = 8*len;
- for(int i = 0; i != 8; i++)
- by[tlen + 7 - i] = (uint8_t) (blen >> (i * 8) & 0xFF);
-
- uint32_t hat = 0;
- for(int z = 0; z < tlen; z+=(512/8)){
- uint32_t W[80];
- memset(W, 0, 80 * sizeof (uint32_t));
+#define bs 64
+
+struct sha01_hash {
+ uint8_t* buffer;
+ uint32_t h0, h1, h2, h3, h4;
+ size_t bufflen;
+ size_t total;
+ uint8_t version;
+};
+
+#define sha0_hash sha01_hash
+#define sha1_hash sha01_hash
+
+struct sha01_hash sha01_init(uint8_t ver){
+ struct sha01_hash a = {.h0 = 0x67452301, .h1 = 0xEFCDAB89, .h2 = 0x98BADCFE, .h3 = 0x10325476, .h4 = 0xC3D2E1F0,
+ .total = 0, .bufflen = 0, .version = ver};
+ a.buffer = calloc(sizeof * a.buffer, bs);
+ return a;
+}
+
+void sha01_round(struct sha01_hash* hash){
+ int hat = 0;
+ uint32_t W[80] = {0};
- for(int i = 0; i != 16; i++){
- int t = 24;
- for(int x = 0;t>=0; x++){
- W[i] += (((uint32_t)by[hat]) << t);
- hat++;
- t-=8;
- }
+ for(int i = 0; i != 16; i++){
+ int t = 24;
+ for(int x = 0;t>=0; x++){
+ W[i] += (((uint32_t)hash->buffer[hat]) << t);
+ hat++;
+ t-=8;
}
- for(int i = 16; i != 80; i++)
- W[i] = rotl32(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16], version);
+ }
+ for(int i = 16; i != 80; i++)
+ W[i] = rotl32(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16], hash->version);
+ uint32_t a = hash->h0;
+ uint32_t b = hash->h1;
+ uint32_t c = hash->h2;
+ uint32_t d = hash->h3;
+ uint32_t e = hash->h4;
- uint32_t a = h0;
- uint32_t b = h1;
- uint32_t c = h2;
- uint32_t d = h3;
- uint32_t e = h4;
-
- for(int i = 0; i != 80; i++){
+ for(int i = 0; i != 80; i++){
- uint32_t f,k;
- if(0 <= i && i <= 19){
- f = (b & c) | ((~b) & d);
- k = 0x5A827999;
- } else if(20 <= i && i <= 39){
- f = b ^ c ^ d;
- k = 0x6ED9EBA1;
- } else if(40 <= i && i <= 59){
- f = (b & c) | (b & d) | (c & d);
- k = 0x8F1BBCDC;
- } else {
- f = b ^ c ^ d;
- k = 0xCA62C1D6;
- }
-
- uint32_t temp = rotl32(a, 5) + f + e + k + W[i];
- e = d;
- d = c;
- c = rotl32(b, 30);
- b = a;
- a = temp;
+ uint32_t f,k;
+ if(0 <= i && i <= 19){
+ f = (b & c) | ((~b) & d);
+ k = 0x5A827999;
+ } else if(20 <= i && i <= 39){
+ f = b ^ c ^ d;
+ k = 0x6ED9EBA1;
+ } else if(40 <= i && i <= 59){
+ f = (b & c) | (b & d) | (c & d);
+ k = 0x8F1BBCDC;
+ } else {
+ f = b ^ c ^ d;
+ k = 0xCA62C1D6;
}
-
- h0 += a;
- h1 += b;
- h2 += c;
- h3 += d;
- h4 += e;
-
-
+
+ uint32_t temp = rotl32(a, 5) + f + e + k + W[i];
+ e = d;
+ d = c;
+ c = rotl32(b, 30);
+ b = a;
+ a = temp;
}
- sprintf(out_stream,"%02x%02x%02x%02x%02x",h0,h1,h2,h3,h4);
- free(by);
+
+ hash->h0 += a;
+ hash->h1 += b;
+ hash->h2 += c;
+ hash->h3 += d;
+ hash->h4 += e;
+}
+
+void sha01_update(uint8_t* input, size_t len, struct sha01_hash* hash){
+ hash->total += len;
+ size_t total_add = len + hash->bufflen;
+ size_t read = 0;
+ if(total_add < bs){
+ memcpy(hash->buffer + hash->bufflen, input, len);
+ hash->bufflen += len;
+ return;
+ }
+
+ for(; total_add >= bs;){
+ memcpy(hash->buffer + hash->bufflen, input + read, bs - hash->bufflen);
+ total_add -= bs - hash->bufflen;
+ hash->bufflen = 0;
+ read += bs;
+ sha01_round(hash);
+ }
+
+ memset(hash->buffer, 0, bs);
+
+ if(read != total_add){
+ memcpy(hash->buffer, input + read, total_add - read);
+ hash->bufflen = total_add - read;
+ }
+}
+
+void sha01_final(struct sha01_hash* hash, char* out_stream){
+ hash->buffer[hash->bufflen] = 0x80;
+
+ if(hash->bufflen > 55) {
+ //too large, needs another buffer
+ sha01_round(hash);
+ }
+
+ size_t lhhh = 8*hash->total;
+ for(int i = 0; i != 8; i++)
+ hash->buffer[63 - i] = (uint8_t) (lhhh >> (i * 8) & 0xFF);
+ sha01_round(hash);
+
+ sprintf(out_stream,"%02x%02x%02x%02x%02x",hash->h0,hash->h1,hash->h2,hash->h3,hash->h4);
+ free(hash->buffer);
+}
+
+struct sha01_hash sha0_init(){
+ return sha01_init(0);
+}
+
+struct sha01_hash sha1_init(){
+ return sha01_init(1);
+}
+
+void sha0_update(uint8_t* input, size_t len, struct sha01_hash* hash){
+ sha01_update(input, len, hash);
+}
+
+void sha1_update(uint8_t* input, size_t len, struct sha01_hash* hash){
+ sha01_update(input, len, hash);
+}
+
+void sha0_final(struct sha01_hash* hash, char* out_stream){
+ sha01_final(hash, out_stream);
+}
+
+void sha1_final(struct sha01_hash* hash, char* out_stream){
+ sha01_final(hash, out_stream);
+}
+
+void sha0(uint8_t* a, size_t len, char* out_stream){
+ struct sha01_hash aa = sha0_init();
+ sha0_update(a, len, &aa);
+ sha0_final(&aa, out_stream);
+}
+
+void sha1(uint8_t* a, size_t len, char* out_stream){
+ struct sha01_hash aa = sha1_init();
+ sha1_update(a, len, &aa);
+ sha1_final(&aa, out_stream);
+}
+
+common_hash_init_update(sha1);
+common_hash_init_update(sha0);
+
+int l_sha1_final(lua_State* L){
+ lua_pushstring(L, "ud");
+ lua_gettable(L, 1);
+
+ struct sha01_hash* a = (struct sha01_hash*)lua_touserdata(L, -1);
+
+ char digest[160];
+ sha1_final(a, digest);
+
+ lua_pushstring(L, digest);
+ return 1;
+}
+
+int l_sha0_final(lua_State* L){
+ return l_sha1_final(L);
}
int l_sha1(lua_State* L){
-
+ if(lua_gettop(L) == 0) return l_sha1_init(L);
size_t len = 0;
char* a = (char*)luaL_checklstring(L, 1, &len);
-
+
char digest[160];
- i_sha01(1, digest, len, a);
+ sha1(a, len, digest);
lua_pushstring(L, digest);
return 1;
};
int l_sha0(lua_State* L){
-
+ if(lua_gettop(L) == 0) return l_sha0_init(L);
size_t len = 0;
char* a = (char*)luaL_checklstring(L, 1, &len);
char digest[160];
- i_sha01(0, digest, len, a);
+ sha0(a, len, digest);
lua_pushstring(L, digest);
return 1;
diff --git a/src/hash/sha01.h b/src/hash/sha01.h
index c574d68..f70a3e0 100644
--- a/src/hash/sha01.h
+++ b/src/hash/sha01.h
@@ -12,4 +12,11 @@
void i_sha01(uint8_t, char*, int, const char*);
int l_sha1(lua_State*);
+int l_sha1_init(lua_State*);
+int l_sha1_update(lua_State*);
+int l_sha1_final(lua_State*);
+
int l_sha0(lua_State*);
+int l_sha0_init(lua_State*);
+int l_sha0_update(lua_State*);
+int l_sha0_final(lua_State*);
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-13 08:07:55 +0000