From bbdb94b7ed8acfb0ded338e4c2b92240e3f10128 Mon Sep 17 00:00:00 2001 From: ame Date: Mon, 23 Oct 2023 20:47:41 -0500 Subject: sha1 & reorganizing --- c.lua | 4 +- readme.md | 2 +- src/crypto.c | 102 ++----------------------------------------------- src/crypto.h | 8 +++- src/hash/md5.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ src/hash/md5.h | 3 ++ src/hash/sha01.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hash/sha01.h | 4 ++ 8 files changed, 234 insertions(+), 103 deletions(-) create mode 100644 src/hash/md5.c create mode 100644 src/hash/md5.h create mode 100644 src/hash/sha01.c create mode 100644 src/hash/sha01.h diff --git a/c.lua b/c.lua index aa83866..1be5a1d 100644 --- a/c.lua +++ b/c.lua @@ -1,3 +1,5 @@ require "llib" -print(llib.crypto.md5("Hello, world!")); +print(llib.crypto.md5("wowa")); +print(llib.crypto.sha1("wowa")); +print(llib.crypto.sha0("wowa")); diff --git a/readme.md b/readme.md index 80b0d52..0c0af8d 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -build with `clang -shared src/*.c -o llib.so` +build with `clang -shared src/*.c src/hash/*.c -o llib.so` useage and docs coming soon:3 diff --git a/src/crypto.c b/src/crypto.c index 1c4c206..7362ac2 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -1,101 +1,5 @@ #include "crypto.h" -#include -#include -#include - -static const uint32_t K[] = {0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, 0xf57c0faf, - 0x4787c62a, 0xa8304613, 0xfd469501, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, - 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, 0xf61e2562, 0xc040b340, 0x265e5a51, - 0xe9b6c7aa, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, 0x21e1cde6, 0xc33707d6, - 0xf4d50d87, 0x455a14ed, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, 0xfffa3942, - 0x8771f681, 0x6d9d6122, 0xfde5380c, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, - 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, - 0xc4ac5665, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, 0x655b59c3, 0x8f0ccc92, - 0xffeff47d, 0x85845dd1, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, - 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391}; - -static const uint32_t s[] = {7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, - 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, - 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, - 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21}; - -int l_md5(lua_State* L){ - uint32_t a0 = 0x67452301; - uint32_t b0 = 0xefcdab89; - uint32_t c0 = 0x98badcfe; - uint32_t d0 = 0x10325476; - - int len = 0; - uint8_t* a = (uint8_t*)luaL_checklstring(L, 1, NULL); - for(int i = 0; a[i]!='\0'; i++) len++; - - int tlen = ((((len + 8) /64) + 1) * 64) - 8; - - uint8_t* b = NULL; - //set the rest to 0x00 for padding - b = calloc(tlen + 64, 1); - - //add padding (0x80 to the end) - memcpy(b, a, len); - b[len] = 0x80; - - //add length to end - uint32_t lhhh = 8*len; - memcpy(b + tlen, &lhhh, 1); - - for(int z = 0; z < tlen; z+=(512/8)){ - uint32_t* M = (uint32_t *) (b + z); - - uint32_t A = a0; - uint32_t B = b0; - uint32_t C = c0; - uint32_t D = d0; - - for(int i = 0; i < 64; i++){ - uint32_t F, g; - - if(i < 16){ - F = (B & C) | ((~B) & D); - g = i; - } else if(i < 32){ - F = (D & B) | ((~D) & C); - g = (5*i + 1) % 16; - } else if(i < 48){ - F = B ^ C ^ D; - g = (3*i + 5) % 16; - } else { - F = C ^ (B | (~D)); - g = (7*i) % 16; - } - - - - F = F + A + K[i] + M[g]; - - uint32_t temp = D; - D = C; - C = B; - B = B + (F << s[i] | (F >> (32 - s[i]))); - A = temp; - } - - a0 += A; - b0 += B; - c0 += C; - d0 += D; - - } - char ou[64]; - sprintf(ou,"%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x", - ((uint8_t*)&a0)[0], ((uint8_t*)&a0)[1], ((uint8_t*)&a0)[2], ((uint8_t*)&a0)[3], - ((uint8_t*)&b0)[0], ((uint8_t*)&b0)[1], ((uint8_t*)&b0)[2], ((uint8_t*)&b0)[3], - ((uint8_t*)&c0)[0], ((uint8_t*)&c0)[1], ((uint8_t*)&c0)[2], ((uint8_t*)&c0)[3], - ((uint8_t*)&d0)[0], ((uint8_t*)&d0)[1], ((uint8_t*)&d0)[2], ((uint8_t*)&d0)[3]); - - lua_pushstring(L, ou); - - free(b); - - return 1; -}; +unsigned i_lr(unsigned y, unsigned offset){ + return ( y << offset ) | ( y >> (32 - offset)); +} diff --git a/src/crypto.h b/src/crypto.h index a62add2..be0683e 100644 --- a/src/crypto.h +++ b/src/crypto.h @@ -1,11 +1,15 @@ #include "lua.h" #include "i_util.h" +#include "hash/md5.h" +#include "hash/sha01.h" -int l_md5(lua_State*); +unsigned i_lr(unsigned, unsigned); static const luaL_Reg crypto_function_list [] = { {"md5",l_md5}, - + {"sha0",l_sha0}, + {"sha1",l_sha1}, + {NULL,NULL} }; diff --git a/src/hash/md5.c b/src/hash/md5.c new file mode 100644 index 0000000..d898d5d --- /dev/null +++ b/src/hash/md5.c @@ -0,0 +1,101 @@ +#include "../crypto.h" +#include "md5.h" +#include +#include +#include + +static const uint32_t K[] = {0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, 0xf57c0faf, + 0x4787c62a, 0xa8304613, 0xfd469501, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, + 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, 0xf61e2562, 0xc040b340, 0x265e5a51, + 0xe9b6c7aa, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, 0x21e1cde6, 0xc33707d6, + 0xf4d50d87, 0x455a14ed, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, 0xfffa3942, + 0x8771f681, 0x6d9d6122, 0xfde5380c, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, + 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, + 0xc4ac5665, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, 0x655b59c3, 0x8f0ccc92, + 0xffeff47d, 0x85845dd1, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, + 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391}; + +static const uint32_t s[] = {7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, + 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, + 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, + 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21}; + +int l_md5(lua_State* L){ + uint32_t a0 = 0x67452301; + uint32_t b0 = 0xefcdab89; + uint32_t c0 = 0x98badcfe; + uint32_t d0 = 0x10325476; + + int len = 0; + uint8_t* a = (uint8_t*)luaL_checklstring(L, 1, NULL); + for(int i = 0; a[i]!='\0'; i++) len++; + + int tlen = ((((len + 8) /64) + 1) * 64) - 8; + + uint8_t* b = NULL; + //set the rest to 0x00 for padding + b = calloc(tlen + 64, 1); + + //add padding (0x80 to the end) + memcpy(b, a, len); + b[len] = 0x80; + + //add length to end + uint32_t lhhh = 8*len; + memcpy(b + tlen, &lhhh, 1); + + for(int z = 0; z < tlen; z+=(512/8)){ + uint32_t* M = (uint32_t *) (b + z); + + uint32_t A = a0; + uint32_t B = b0; + uint32_t C = c0; + uint32_t D = d0; + + for(int i = 0; i < 64; i++){ + uint32_t F, g; + + if(i < 16){ + F = (B & C) | ((~B) & D); + g = i; + } else if(i < 32){ + F = (D & B) | ((~D) & C); + g = (5*i + 1) % 16; + } else if(i < 48){ + F = B ^ C ^ D; + g = (3*i + 5) % 16; + } else { + F = C ^ (B | (~D)); + g = (7*i) % 16; + } + + + + F = F + A + K[i] + M[g]; + + uint32_t temp = D; + D = C; + C = B; + B = B + i_lr(F, s[i]); + A = temp; + } + + a0 += A; + b0 += B; + c0 += C; + d0 += D; + + } + char ou[64]; + sprintf(ou,"%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x", + ((uint8_t*)&a0)[0], ((uint8_t*)&a0)[1], ((uint8_t*)&a0)[2], ((uint8_t*)&a0)[3], + ((uint8_t*)&b0)[0], ((uint8_t*)&b0)[1], ((uint8_t*)&b0)[2], ((uint8_t*)&b0)[3], + ((uint8_t*)&c0)[0], ((uint8_t*)&c0)[1], ((uint8_t*)&c0)[2], ((uint8_t*)&c0)[3], + ((uint8_t*)&d0)[0], ((uint8_t*)&d0)[1], ((uint8_t*)&d0)[2], ((uint8_t*)&d0)[3]); + + lua_pushstring(L, ou); + + free(b); + + return 1; +}; diff --git a/src/hash/md5.h b/src/hash/md5.h new file mode 100644 index 0000000..3bc7556 --- /dev/null +++ b/src/hash/md5.h @@ -0,0 +1,3 @@ +#include "../lua.h" + +int l_md5(lua_State*); diff --git a/src/hash/sha01.c b/src/hash/sha01.c new file mode 100644 index 0000000..e0cf1c7 --- /dev/null +++ b/src/hash/sha01.c @@ -0,0 +1,113 @@ +#include "../crypto.h" +#include "sha01.h" +#include +#include +#include + +void i_sha01(unsigned version, char* out_stream, 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 len = 0; + for(int i = 0; input[i]!='\0'; i++) len++; + 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)); + + 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 = 16; i != 80; i++) + W[i] = i_lr(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16], version); + + + 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++){ + + 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 = i_lr(a, 5) + f + e + k + W[i]; + e = d; + d = c; + c = i_lr(b, 30); + b = a; + a = temp; + } + + h0 += a; + h1 += b; + h2 += c; + h3 += d; + h4 += e; + + + } + sprintf(out_stream,"%02x%02x%02x%02x%02x",h0,h1,h2,h3,h4); + return; +} + +int l_sha1(lua_State* L){ + + int len = 0; + char* a = (char*)luaL_checklstring(L, 1, NULL); + + char digest[160]; + + i_sha01(1, digest, a); + lua_pushstring(L, digest); + + return 1; +}; + +int l_sha0(lua_State* L){ + + int len = 0; + char* a = (char*)luaL_checklstring(L, 1, NULL); + + char digest[160]; + + i_sha01(0, digest, a); + lua_pushstring(L, digest); + + return 1; +}; diff --git a/src/hash/sha01.h b/src/hash/sha01.h new file mode 100644 index 0000000..8ad31ab --- /dev/null +++ b/src/hash/sha01.h @@ -0,0 +1,4 @@ +#include "../lua.h" + +int l_sha1(lua_State*); +int l_sha0(lua_State*); -- cgit v1.2.3