From d11d4a6de1a3ec00021bc7772a64821032b33250 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 15 Aug 2013 08:51:43 +0000 Subject: - custom sha1 engine removed from GG; - minor code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@5700 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/libgadu/events.c | 6 +- protocols/Gadu-Gadu/src/libgadu/sha1.c | 210 ++----------------------------- 2 files changed, 13 insertions(+), 203 deletions(-) (limited to 'protocols/Gadu-Gadu') diff --git a/protocols/Gadu-Gadu/src/libgadu/events.c b/protocols/Gadu-Gadu/src/libgadu/events.c index a730e9d620..af421f93ff 100644 --- a/protocols/Gadu-Gadu/src/libgadu/events.c +++ b/protocols/Gadu-Gadu/src/libgadu/events.c @@ -2617,12 +2617,8 @@ struct gg_event *gg_watch_fd(struct gg_session *sess) case GG_LOGIN_HASH_SHA1: { char tmp[41]; - int i; - gg_login_hash_sha1((char*) password, w->key, login_hash); - for (i = 0; i < 40; i += 2) - snprintf(tmp + i, sizeof(tmp) - i, "%02x", login_hash[i / 2]); - + bin2hex(login_hash, 20, tmp); gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_watch_fd() challenge %.4x --> SHA1 hash: %s\n", w->key, tmp); break; diff --git a/protocols/Gadu-Gadu/src/libgadu/sha1.c b/protocols/Gadu-Gadu/src/libgadu/sha1.c index 124a1cffaa..b01b77a00c 100644 --- a/protocols/Gadu-Gadu/src/libgadu/sha1.c +++ b/protocols/Gadu-Gadu/src/libgadu/sha1.c @@ -37,192 +37,6 @@ #include "libgadu.h" -/** \cond ignore */ - -#if defined(GG_CONFIG_HAVE_OPENSSL) && !defined(GG_CONFIG_MIRANDA) - -#include - -#else - -/* -SHA-1 in C -By Steve Reid -100% Public Domain - -Modified by Wojtek Kaniewski for compatibility -with libgadu and OpenSSL API. - -Test Vectors (from FIPS PUB 180-1) -"abc" - A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D -"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" - 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 -A million repetitions of "a" - 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F -*/ - -/* #define LITTLE_ENDIAN * This should be #define'd if true. */ -/* #define SHA1HANDSOFF * Copies data before messing with it. */ - -#include - -typedef struct { - uint32_t state[5]; - uint32_t count[2]; - unsigned char buffer[64]; -} SHA_CTX; - -static void SHA1_Transform(uint32_t state[5], const unsigned char buffer[64]); -static void SHA1_Init(SHA_CTX* context); -static void SHA1_Update(SHA_CTX* context, const unsigned char* data, unsigned int len); -static void SHA1_Final(unsigned char digest[20], SHA_CTX* context); - -#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) - -/* blk0() and blk() perform the initial expand. */ -/* I got the idea of expanding during the round function from SSLeay */ -#ifndef GG_CONFIG_BIGENDIAN -#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ - |(rol(block->l[i],8)&0x00FF00FF)) -#else -#define blk0(i) block->l[i] -#endif -#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ - ^block->l[(i+2)&15]^block->l[i&15],1)) - -/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); -#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); -#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); - - -/* Hash a single 512-bit block. This is the core of the algorithm. */ - -static void SHA1_Transform(uint32_t state[5], const unsigned char buffer[64]) -{ -uint32_t a, b, c, d, e; -typedef union { - unsigned char c[64]; - uint32_t l[16]; -} CHAR64LONG16; -CHAR64LONG16* block; -static unsigned char workspace[64]; - block = (CHAR64LONG16*)workspace; - memcpy(block, buffer, 64); - /* Copy context->state[] to working vars */ - a = state[0]; - b = state[1]; - c = state[2]; - d = state[3]; - e = state[4]; - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - /* Add the working vars back into context.state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; - /* Wipe variables */ - a = b = c = d = e = 0; -} - - -/* SHA1_Init - Initialize new context */ - -static void SHA1_Init(SHA_CTX* context) -{ - /* SHA1 initialization constants */ - context->state[0] = 0x67452301; - context->state[1] = 0xEFCDAB89; - context->state[2] = 0x98BADCFE; - context->state[3] = 0x10325476; - context->state[4] = 0xC3D2E1F0; - context->count[0] = context->count[1] = 0; -} - - -/* Run your data through this. */ - -static void SHA1_Update(SHA_CTX* context, const unsigned char* data, unsigned int len) -{ -unsigned int i, j; - - j = (context->count[0] >> 3) & 63; - if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++; - context->count[1] += (len >> 29); - if ((j + len) > 63) { - memcpy(&context->buffer[j], data, (i = 64-j)); - SHA1_Transform(context->state, context->buffer); - for ( ; i + 63 < len; i += 64) { - SHA1_Transform(context->state, &data[i]); - } - j = 0; - } - else i = 0; - memcpy(&context->buffer[j], &data[i], len - i); -} - - -/* Add padding and return the message digest. */ - -static void SHA1_Final(unsigned char digest[20], SHA_CTX* context) -{ -uint32_t i, j; -unsigned char finalcount[8]; - - for (i = 0; i < 8; i++) { - finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] - >> ((3-(i & 3)) * 8)) & 255); /* Endian independent */ - } - SHA1_Update(context, (unsigned char *)"\200", 1); - while ((context->count[0] & 504) != 448) { - SHA1_Update(context, (unsigned char *)"\0", 1); - } - SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */ - for (i = 0; i < 20; i++) { - digest[i] = (unsigned char) - ((context->state[i>>2] >> ((3-(i & 3)) * 8)) & 255); - } - /* Wipe variables */ - i = j = 0; - memset(context->buffer, 0, 64); - memset(context->state, 0, 20); - memset(context->count, 0, 8); - memset(&finalcount, 0, 8); -#ifdef SHA1HANDSOFF /* make SHA1_Transform overwrite it's own static vars */ - SHA1_Transform(context->state, context->buffer); -#endif -} - -#endif /* GG_CONFIG_HAVE_OPENSSL */ - -/** \endcond */ - -/** \cond internal */ - /** * \internal Liczy skrót SHA1 z ziarna i hasła. * @@ -232,14 +46,13 @@ unsigned char finalcount[8]; */ void gg_login_hash_sha1(const char *password, uint32_t seed, uint8_t *result) { - SHA_CTX ctx; + mir_sha1_ctx ctx; - SHA1_Init(&ctx); - SHA1_Update(&ctx, (const unsigned char*) password, (unsigned int)strlen(password)); + mir_sha1_init(&ctx); + mir_sha1_append(&ctx, (uint8_t*)password, (unsigned int)strlen(password)); seed = gg_fix32(seed); - SHA1_Update(&ctx, (uint8_t*) &seed, 4); - - SHA1_Final(result, &ctx); + mir_sha1_append(&ctx, (uint8_t*)&seed, 4); + mir_sha1_finish(&ctx, result); } /** @@ -253,7 +66,7 @@ void gg_login_hash_sha1(const char *password, uint32_t seed, uint8_t *result) int gg_file_hash_sha1(int fd, uint8_t *result) { unsigned char buf[4096]; - SHA_CTX ctx; + mir_sha1_ctx ctx; off_t pos, len; int res; @@ -266,12 +79,13 @@ int gg_file_hash_sha1(int fd, uint8_t *result) if (lseek(fd, 0, SEEK_SET) == (off_t) -1) return -1; - SHA1_Init(&ctx); + mir_sha1_init(&ctx); if (len <= 10485760) { while ((res = read(fd, buf, sizeof(buf))) > 0) - SHA1_Update(&ctx, buf, res); - } else { + mir_sha1_append(&ctx, buf, res); + } + else { int i; for (i = 0; i < 9; i++) { @@ -286,7 +100,7 @@ int gg_file_hash_sha1(int fd, uint8_t *result) break; } - SHA1_Update(&ctx, buf, res); + mir_sha1_append(&ctx, buf, res); } if (res == -1) @@ -297,7 +111,7 @@ int gg_file_hash_sha1(int fd, uint8_t *result) if (res == -1) return -1; - SHA1_Final(result, &ctx); + mir_sha1_finish(&ctx, result); if (lseek(fd, pos, SEEK_SET) == (off_t) -1) return -1; -- cgit v1.2.3