From f468b2a2851e7809a30d8798828ae044f9f6d0be Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 17 Jul 2008 20:12:24 +0200 Subject: [PATCH] Use SHA1 functions from gnulib --- Makefile.am | 10 +-- backuppcd.c | 57 ++++++++++---- sha1.c | 221 ---------------------------------------------------- sha1.h | 18 ----- 4 files changed, 43 insertions(+), 263 deletions(-) delete mode 100644 sha1.c delete mode 100644 sha1.h diff --git a/Makefile.am b/Makefile.am index 35acfcb..ce56d72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,6 @@ noinst_LIBS = backuppcd backuppc backuppcd_SOURCES = backuppcd.c \ net.c \ backuppcd-common.c \ - sha1.c \ backuppcd-auth.c \ backuppcd-notify.c @@ -22,14 +21,11 @@ backuppcd_client_SOURCES = backuppcd-client.c \ libbackuppcd.c \ net.c \ backuppcd-common.c \ - sha1.c \ libbackuppc.c backuppcd_tar_SOURCES = backuppcd-tar.c \ net.c \ - backuppcd-common.c \ - sha1.c - -backuppcd_passwd_SOURCES = backuppcd-passwd.c \ - sha1.c + backuppcd-common.c +#backuppcd_passwd_SOURCES = backuppcd-passwd.c \ +# \ No newline at end of file diff --git a/backuppcd.c b/backuppcd.c index 0b7a270..98a5912 100644 --- a/backuppcd.c +++ b/backuppcd.c @@ -28,7 +28,7 @@ #include "backuppcd-auth.h" #include "backuppcd-notify.h" #include "net.h" -#include "sha1.h" +#include "lib/sha1.h" #include "lib/md4.h" #include "lib/md5.h" @@ -993,7 +993,7 @@ static ssize_t backuppc_get_attr(struct backuppc_dirent *dent, char *outbuf, siz struct md4_ctx md4_ctx; struct md5_ctx bpchash_ctx; struct md5_ctx md5_ctx; - SHA1_CTX sha1_ctx; + struct sha1_ctx sha1_ctx; uint64_t filepos = 0, preread_filepos; uint32_t len, timeval, idval; uint16_t modeval; @@ -1168,7 +1168,7 @@ static ssize_t backuppc_get_attr(struct backuppc_dirent *dent, char *outbuf, siz md5_init_ctx(&md5_ctx); } if ((options & BPC_OPT_SHA1) == BPC_OPT_SHA1) { - SHA1Init(&sha1_ctx); + sha1_init_ctx(&sha1_ctx); } if ((options & BPC_OPT_BPCHASH) == BPC_OPT_BPCHASH) { /* @@ -1212,7 +1212,7 @@ static ssize_t backuppc_get_attr(struct backuppc_dirent *dent, char *outbuf, siz md5_process_bytes(filebuf, read_ret, &md5_ctx); } if ((options & BPC_OPT_SHA1) == BPC_OPT_SHA1) { - SHA1Update(&sha1_ctx, filebuf, read_ret); + sha1_process_bytes(filebuf, read_ret, &sha1_ctx); } if ((options & BPC_OPT_BPCHASH) == BPC_OPT_BPCHASH) { if (dent->size > 262144) { @@ -1290,7 +1290,7 @@ static ssize_t backuppc_get_attr(struct backuppc_dirent *dent, char *outbuf, siz buf += 16; } if ((options & BPC_OPT_SHA1) == BPC_OPT_SHA1) { - SHA1Final(digest, &sha1_ctx); + sha1_finish_ctx(&sha1_ctx, digest); id = htons(BPC_ATTRID_SHA1); len = htonl(20); @@ -2139,6 +2139,29 @@ static void backuppc_process_auth_fini(struct backuppc_client_info *client) { return; } +static char * sha1sum(char *string) { + unsigned char digest[20]; + static char ret[(sizeof(digest) * 2) + 1] = {0}; + static char hexabet[] = "0123456789abcdef"; + struct sha1_ctx ctx; + int retcnt = 0, i; + + sha1_init_ctx(&ctx); + + sha1_process_bytes(string, strlen(string), &ctx); + + sha1_finish_ctx(&ctx, digest); + + for (i = 0; i < sizeof(digest); i++) { + ret[retcnt++] = hexabet[(digest[i] & 0xf0) >> 4]; + ret[retcnt++] = hexabet[digest[i] & 0xf]; + } + + ret[retcnt] = '\0'; + + return(ret); +} + /* * SYNOPSIS: * static void backuppc_pathmangle( @@ -2186,7 +2209,8 @@ static int backuppc_process_auth(struct backuppc_client_info *client) { /* Do authentication ... */ /* Attempt to authenticate with the master password. */ - crypt_passwd = SHA1sum(ph->password); + crypt_passwd = sha1sum(ph->password); + if (strcmp(crypt_passwd, BPC_CONF_MASTER_PASSWORD) == 0) { auth_stat = BPC_STATUS_OKAY; client->privs = BPC_PRIV_RDWR; @@ -2195,17 +2219,16 @@ static int backuppc_process_auth(struct backuppc_client_info *client) { * Perform authentication of the user */ client->privs = bpcd_auth_verify(ph->username, crypt_passwd, client->addr.s_addr); - - /* - * If the authentication subsystem returns an error, assign - * the session no privileges and declare failure. - */ - if (client->privs == BPC_PRIV_ERROR) { - auth_stat = BPC_STATUS_FAILED; - client->privs = BPC_PRIV_NONE; - } else { - auth_stat = BPC_STATUS_OKAY; - } + } + /* + * If the authentication subsystem returns an error, assign + * the session no privileges and declare failure. + */ + if (client->privs == BPC_PRIV_ERROR) { + auth_stat = BPC_STATUS_FAILED; + client->privs = BPC_PRIV_NONE; + } else { + auth_stat = BPC_STATUS_OKAY; } if (auth_stat == BPC_STATUS_OKAY) { diff --git a/sha1.c b/sha1.c deleted file mode 100644 index 9b81fbe..0000000 --- a/sha1.c +++ /dev/null @@ -1,221 +0,0 @@ -/* - SHA-1 in C - By Steve Reid - 100% Public Domain - -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 "compat.h" - -#define SHA1HANDSOFF 1 -#ifdef HAVE_STDIO_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif - -#include "sha1.h" - -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN 4321 -#endif -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN 1234 -#endif - -#ifndef __BYTE_ORDER -#ifdef WORDS_BIGENDIAN -#define __BYTE_ORDER __BIG_ENDIAN -#else -#define __BYTE_ORDER __LITTLE_ENDIAN -#endif -#endif - -#if __BYTE_ORDER == __BIG_ENDIAN -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 1 -#endif -#undef LITTLE_ENDIAN -#else -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1 -#endif -#undef BIG_ENDIAN -#endif - -#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 */ -#ifdef LITTLE_ENDIAN -#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. */ - -void SHA1Transform(unsigned long state[5], unsigned char buffer[64]) -{ -unsigned long a, b, c, d, e; -typedef union { - unsigned char c[64]; - unsigned long l[16]; -} CHAR64LONG16; -CHAR64LONG16* block; -#ifdef SHA1HANDSOFF -static unsigned char workspace[64]; - block = (CHAR64LONG16*)workspace; - memcpy(block, buffer, 64); -#else - block = (CHAR64LONG16*)buffer; -#endif - /* 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; -} - - -/* SHA1Init - Initialize new context */ - -void SHA1Init(SHA1_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. */ - -void SHA1Update(SHA1_CTX* context, 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)); - SHA1Transform(context->state, context->buffer); - for ( ; i + 63 < len; i += 64) { - SHA1Transform(context->state, &data[i]); - } - j = 0; - } - else i = 0; - memcpy(&context->buffer[j], &data[i], len - i); -} - - -/* Add padding and return the message digest. */ - -void SHA1Final(unsigned char digest[20], SHA1_CTX* context) -{ -unsigned long 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 */ - } - SHA1Update(context, (unsigned char *)"\200", 1); - while ((context->count[0] & 504) != 448) { - SHA1Update(context, (unsigned char *)"\0", 1); - } - SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ - 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 SHA1Transform overwrite it's own static vars */ - SHA1Transform(context->state, context->buffer); -#endif -} - -char *SHA1sum(char *string) { - unsigned char digest[20]; - static char ret[(sizeof(digest) * 2) + 1] = {0}; - static char hexabet[] = "0123456789abcdef"; - SHA1_CTX ctx; - int retcnt = 0, i; - - SHA1Init(&ctx); - - SHA1Update(&ctx, string, strlen(string)); - - SHA1Final(digest, &ctx); - - for (i = 0; i < sizeof(digest); i++) { - ret[retcnt++] = hexabet[(digest[i] & 0xf0) >> 4]; - ret[retcnt++] = hexabet[digest[i] & 0xf]; - } - - ret[retcnt] = '\0'; - - return(ret); -} diff --git a/sha1.h b/sha1.h deleted file mode 100644 index 93c8dd5..0000000 --- a/sha1.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _BPC_SHA1_H -#define _BPC_SHA1_H - -typedef struct { - unsigned long state[5]; - unsigned long count[2]; - unsigned char buffer[64]; -} SHA1_CTX; - -void SHA1Transform(unsigned long state[5], unsigned char buffer[64]); -void SHA1Init(SHA1_CTX* context); -void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len); -void SHA1Final(unsigned char digest[20], SHA1_CTX* context); - -/* RSK */ -char *SHA1sum(char *string); - -#endif -- 2.39.5