From dceeec3e443d8150b9b562ee53c2305e7659b750 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 4 Apr 2012 11:10:42 -0400 Subject: [PATCH] SHA1 package added with example in example web service --- plugins/duda/example/hello.c | 22 +++ plugins/duda/packages/Makefile.in | 2 +- plugins/duda/packages/sha1/Makefile.in | 18 ++ plugins/duda/packages/sha1/duda_package.c | 58 ++++++ plugins/duda/packages/sha1/sha1.c | 288 +++++++++++++++++++++++++++++ plugins/duda/packages/sha1/sha1.h | 50 +++++ 6 files changed, 437 insertions(+), 1 deletions(-) create mode 100644 plugins/duda/packages/sha1/Makefile.in create mode 100644 plugins/duda/packages/sha1/duda_package.c create mode 100644 plugins/duda/packages/sha1/sha1.c create mode 100644 plugins/duda/packages/sha1/sha1.h diff --git a/plugins/duda/example/hello.c b/plugins/duda/example/hello.c index bb5b19e..bdef840 100644 --- a/plugins/duda/example/hello.c +++ b/plugins/duda/example/hello.c @@ -2,6 +2,7 @@ #include "webservice.h" #include "packages/json/json.h" +#include "packages/sha1/sha1.h" #define INCORRECT_PARAMETERS "Incorrect Parameters\n" #define FORMATTED_OUT "==Formatted JSON output==\n" @@ -35,6 +36,8 @@ duda_global_t my_data_empty; * | format 11 | * | (formatted/unformatted) | * +--------------------------------------------------------------+ + * | sha1_test 0 | + * +--------------------------------------------------------------+ * */ @@ -54,6 +57,20 @@ void cb_hello_world(duda_request_t *dr) response->end(dr, cb_end); } +void cb_sha1_test(duda_request_t *dr) +{ + char toEncode[] = "hello world!"; + unsigned int length = strlen(toEncode); + unsigned char encoded[SHA_DIGEST_LENGTH]; + sha1->encode(toEncode, encoded, length); + + response->http_status(dr, 200); + response->http_header(dr, "Content-Type: text/html;charset=UTF-8", 37); + response->body_write(dr, "Raw: hello world!
Encoded: ", 30); + response->body_write(dr, (char *)encoded, SHA_DIGEST_LENGTH); + response->end(dr, cb_end); +} + void cb_sendfile(duda_request_t *dr) { response->http_status(dr, 200); @@ -224,6 +241,7 @@ int duda_init(struct duda_api_objects *api) duda_service_init(); duda_load_package(json, "json"); + duda_load_package(sha1, "sha1"); /* An empty global variable */ duda_global_init(my_data_empty, NULL); @@ -257,6 +275,10 @@ int duda_init(struct duda_api_objects *api) method = map->method_new("sendfile", "cb_sendfile", 0); map->interface_add_method(method, if_system); + /* URI: /hello/examples/sha1_test */ + method = map->method_new("sha1_test", "cb_sha1_test", 0); + map->interface_add_method(method, if_system); + /* Add interface to map */ duda_service_add_interface(if_system); diff --git a/plugins/duda/packages/Makefile.in b/plugins/duda/packages/Makefile.in index bec88f8..2343c76 100644 --- a/plugins/duda/packages/Makefile.in +++ b/plugins/duda/packages/Makefile.in @@ -1,4 +1,4 @@ -DIRS = base64 json sqlite +DIRS = base64 json sha1 sqlite all: @(for d in $(DIRS); do $(MAKE) -C $$d; done) diff --git a/plugins/duda/packages/sha1/Makefile.in b/plugins/duda/packages/sha1/Makefile.in new file mode 100644 index 0000000..2ec2eb8 --- /dev/null +++ b/plugins/duda/packages/sha1/Makefile.in @@ -0,0 +1,18 @@ +CC = $CC +CFLAGS = $CFLAGS +LDFLAGS = $LDFLAGS +DEFS = $DEFS +INCDIR = ../../../../src/include -I../../ +OBJECTS = duda_package.o sha1.o +SOURCES = duda_package.c sha1.c + +all: ../sha1.dpkg + +../sha1.dpkg: $(OBJECTS) + $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -Wl -o $@ $^ -lc + +.c.o: $(SOURCES) + $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< + +clean: + rm -rf *~ *.o diff --git a/plugins/duda/packages/sha1/duda_package.c b/plugins/duda/packages/sha1/duda_package.c new file mode 100644 index 0000000..c1d30a7 --- /dev/null +++ b/plugins/duda/packages/sha1/duda_package.c @@ -0,0 +1,58 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +/* Monkey HTTP Daemon + * ------------------ + * Copyright (C) 2001-2012, Eduardo Silva P. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include + +#include "duda_package.h" +#include "sha1.h" + +static void sha1_encode (const void *dataIn, unsigned char *dataOut, + unsigned long length) +{ + SHA_CTX sha; + SHA1_Init(&sha); + SHA1_Update(&sha, dataIn, length); + SHA1_Final(dataOut, &sha); +} + +struct duda_api_sha1 *get_sha1_api() +{ + struct duda_api_sha1 *sha1; + + /* Alloc object */ + sha1 = malloc(sizeof(struct duda_api_sha1)); + + /* Map API calls */ + sha1->encode = sha1_encode; + + return sha1; +} + +duda_package_t *init_duda_package() +{ + duda_package_t *dpkg = malloc(sizeof(duda_package_t)); + + dpkg->name = "sha1"; + dpkg->version = "0.1"; + dpkg->api = get_sha1_api(); + + return dpkg; +} diff --git a/plugins/duda/packages/sha1/sha1.c b/plugins/duda/packages/sha1/sha1.c new file mode 100644 index 0000000..53c7946 --- /dev/null +++ b/plugins/duda/packages/sha1/sha1.c @@ -0,0 +1,288 @@ +/* + * Code adapted to fill Monkey Project requirements, no big changes + * just a few header files added + */ + +#include +#include + +/* + * SHA1 routine optimized to do word accesses rather than byte accesses, + * and to avoid unnecessary copies into the context array. + * + * This was initially based on the Mozilla SHA1 implementation, although + * none of the original Mozilla code remains. + */ + +#include "sha1.h" + +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + +/* + * Force usage of rol or ror by selecting the one with the smaller constant. + * It _can_ generate slightly smaller code (a constant of 1 is special), but + * perhaps more importantly it's possibly faster on any uarch that does a + * rotate with a loop. + */ + +#define SHA_ASM(op, x, n) ({ unsigned int __res; __asm__(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; }) +#define SHA_ROL(x,n) SHA_ASM("rol", x, n) +#define SHA_ROR(x,n) SHA_ASM("ror", x, n) + +#else + +#define SHA_ROT(X,l,r) (((X) << (l)) | ((X) >> (r))) +#define SHA_ROL(X,n) SHA_ROT(X,n,32-(n)) +#define SHA_ROR(X,n) SHA_ROT(X,32-(n),n) + +#endif + +/* + * If you have 32 registers or more, the compiler can (and should) + * try to change the array[] accesses into registers. However, on + * machines with less than ~25 registers, that won't really work, + * and at least gcc will make an unholy mess of it. + * + * So to avoid that mess which just slows things down, we force + * the stores to memory to actually happen (we might be better off + * with a 'W(t)=(val);asm("":"+m" (W(t))' there instead, as + * suggested by Artur Skawina - that will also make gcc unable to + * try to do the silly "optimize away loads" part because it won't + * see what the value will be). + * + * Ben Herrenschmidt reports that on PPC, the C version comes close + * to the optimized asm with this (ie on PPC you don't want that + * 'volatile', since there are lots of registers). + * + * On ARM we get the best code generation by forcing a full memory barrier + * between each SHA_ROUND, otherwise gcc happily get wild with spilling and + * the stack frame size simply explode and performance goes down the drain. + */ + +#if defined(__i386__) || defined(__x86_64__) + #define setW(x, val) (*(volatile unsigned int *)&W(x) = (val)) +#elif defined(__GNUC__) && defined(__arm__) + #define setW(x, val) do { W(x) = (val); __asm__("":::"memory"); } while (0) +#else + #define setW(x, val) (W(x) = (val)) +#endif + +/* + * Performance might be improved if the CPU architecture is OK with + * unaligned 32-bit loads and a fast ntohl() is available. + * Otherwise fall back to byte loads and shifts which is portable, + * and is faster on architectures with memory alignment issues. + */ + +#if defined(__i386__) || defined(__x86_64__) || \ + defined(_M_IX86) || defined(_M_X64) || \ + defined(__ppc__) || defined(__ppc64__) || \ + defined(__powerpc__) || defined(__powerpc64__) || \ + defined(__s390__) || defined(__s390x__) + +#define get_be32(p) ntohl(*(unsigned int *)(p)) +#define put_be32(p, v) do { *(unsigned int *)(p) = htonl(v); } while (0) + +#else + +#define get_be32(p) ( \ + (*((unsigned char *)(p) + 0) << 24) | \ + (*((unsigned char *)(p) + 1) << 16) | \ + (*((unsigned char *)(p) + 2) << 8) | \ + (*((unsigned char *)(p) + 3) << 0) ) +#define put_be32(p, v) do { \ + unsigned int __v = (v); \ + *((unsigned char *)(p) + 0) = __v >> 24; \ + *((unsigned char *)(p) + 1) = __v >> 16; \ + *((unsigned char *)(p) + 2) = __v >> 8; \ + *((unsigned char *)(p) + 3) = __v >> 0; } while (0) + +#endif + +/* This "rolls" over the 512-bit array */ +#define W(x) (array[(x)&15]) + +/* + * Where do we get the source from? The first 16 iterations get it from + * the input data, the next mix it from the 512-bit array. + */ +#define SHA_SRC(t) get_be32(data + t) +#define SHA_MIX(t) SHA_ROL(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1) + +#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \ + unsigned int TEMP = input(t); setW(t, TEMP); \ + E += TEMP + SHA_ROL(A,5) + (fn) + (constant); \ + B = SHA_ROR(B, 2); } while (0) + +#define T_0_15(t, A, B, C, D, E) SHA_ROUND(t, SHA_SRC, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) +#define T_16_19(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) +#define T_20_39(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0x6ed9eba1, A, B, C, D, E ) +#define T_40_59(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, ((B&C)+(D&(B^C))) , 0x8f1bbcdc, A, B, C, D, E ) +#define T_60_79(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0xca62c1d6, A, B, C, D, E ) + +static void blk_SHA1_Block(blk_SHA_CTX *ctx, const unsigned int *data) +{ + unsigned int A,B,C,D,E; + unsigned int array[16]; + + A = ctx->H[0]; + B = ctx->H[1]; + C = ctx->H[2]; + D = ctx->H[3]; + E = ctx->H[4]; + + /* Round 1 - iterations 0-16 take their input from 'data' */ + T_0_15( 0, A, B, C, D, E); + T_0_15( 1, E, A, B, C, D); + T_0_15( 2, D, E, A, B, C); + T_0_15( 3, C, D, E, A, B); + T_0_15( 4, B, C, D, E, A); + T_0_15( 5, A, B, C, D, E); + T_0_15( 6, E, A, B, C, D); + T_0_15( 7, D, E, A, B, C); + T_0_15( 8, C, D, E, A, B); + T_0_15( 9, B, C, D, E, A); + T_0_15(10, A, B, C, D, E); + T_0_15(11, E, A, B, C, D); + T_0_15(12, D, E, A, B, C); + T_0_15(13, C, D, E, A, B); + T_0_15(14, B, C, D, E, A); + T_0_15(15, A, B, C, D, E); + + /* Round 1 - tail. Input from 512-bit mixing array */ + T_16_19(16, E, A, B, C, D); + T_16_19(17, D, E, A, B, C); + T_16_19(18, C, D, E, A, B); + T_16_19(19, B, C, D, E, A); + + /* Round 2 */ + T_20_39(20, A, B, C, D, E); + T_20_39(21, E, A, B, C, D); + T_20_39(22, D, E, A, B, C); + T_20_39(23, C, D, E, A, B); + T_20_39(24, B, C, D, E, A); + T_20_39(25, A, B, C, D, E); + T_20_39(26, E, A, B, C, D); + T_20_39(27, D, E, A, B, C); + T_20_39(28, C, D, E, A, B); + T_20_39(29, B, C, D, E, A); + T_20_39(30, A, B, C, D, E); + T_20_39(31, E, A, B, C, D); + T_20_39(32, D, E, A, B, C); + T_20_39(33, C, D, E, A, B); + T_20_39(34, B, C, D, E, A); + T_20_39(35, A, B, C, D, E); + T_20_39(36, E, A, B, C, D); + T_20_39(37, D, E, A, B, C); + T_20_39(38, C, D, E, A, B); + T_20_39(39, B, C, D, E, A); + + /* Round 3 */ + T_40_59(40, A, B, C, D, E); + T_40_59(41, E, A, B, C, D); + T_40_59(42, D, E, A, B, C); + T_40_59(43, C, D, E, A, B); + T_40_59(44, B, C, D, E, A); + T_40_59(45, A, B, C, D, E); + T_40_59(46, E, A, B, C, D); + T_40_59(47, D, E, A, B, C); + T_40_59(48, C, D, E, A, B); + T_40_59(49, B, C, D, E, A); + T_40_59(50, A, B, C, D, E); + T_40_59(51, E, A, B, C, D); + T_40_59(52, D, E, A, B, C); + T_40_59(53, C, D, E, A, B); + T_40_59(54, B, C, D, E, A); + T_40_59(55, A, B, C, D, E); + T_40_59(56, E, A, B, C, D); + T_40_59(57, D, E, A, B, C); + T_40_59(58, C, D, E, A, B); + T_40_59(59, B, C, D, E, A); + + /* Round 4 */ + T_60_79(60, A, B, C, D, E); + T_60_79(61, E, A, B, C, D); + T_60_79(62, D, E, A, B, C); + T_60_79(63, C, D, E, A, B); + T_60_79(64, B, C, D, E, A); + T_60_79(65, A, B, C, D, E); + T_60_79(66, E, A, B, C, D); + T_60_79(67, D, E, A, B, C); + T_60_79(68, C, D, E, A, B); + T_60_79(69, B, C, D, E, A); + T_60_79(70, A, B, C, D, E); + T_60_79(71, E, A, B, C, D); + T_60_79(72, D, E, A, B, C); + T_60_79(73, C, D, E, A, B); + T_60_79(74, B, C, D, E, A); + T_60_79(75, A, B, C, D, E); + T_60_79(76, E, A, B, C, D); + T_60_79(77, D, E, A, B, C); + T_60_79(78, C, D, E, A, B); + T_60_79(79, B, C, D, E, A); + + ctx->H[0] += A; + ctx->H[1] += B; + ctx->H[2] += C; + ctx->H[3] += D; + ctx->H[4] += E; +} + +void blk_SHA1_Init(blk_SHA_CTX *ctx) +{ + ctx->size = 0; + + /* Initialize H with the magic constants (see FIPS180 for constants) */ + ctx->H[0] = 0x67452301; + ctx->H[1] = 0xefcdab89; + ctx->H[2] = 0x98badcfe; + ctx->H[3] = 0x10325476; + ctx->H[4] = 0xc3d2e1f0; +} + +void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len) +{ + unsigned int lenW = ctx->size & 63; + + ctx->size += len; + + /* Read the data into W and process blocks as they get full */ + if (lenW) { + unsigned int left = 64 - lenW; + if (len < left) + left = len; + memcpy(lenW + (char *)ctx->W, data, left); + lenW = (lenW + left) & 63; + len -= left; + data = ((const char *)data + left); + if (lenW) + return; + blk_SHA1_Block(ctx, ctx->W); + } + while (len >= 64) { + blk_SHA1_Block(ctx, data); + data = ((const char *)data + 64); + len -= 64; + } + if (len) + memcpy(ctx->W, data, len); +} + +void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx) +{ + static const unsigned char pad[64] = { 0x80 }; + unsigned int padlen[2]; + int i; + + /* Pad with a binary 1 (ie 0x80), then zeroes, then length */ + padlen[0] = htonl((uint32_t)(ctx->size >> 29)); + padlen[1] = htonl((uint32_t)(ctx->size << 3)); + + i = ctx->size & 63; + blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i))); + blk_SHA1_Update(ctx, padlen, 8); + + /* Output hash */ + for (i = 0; i < 5; i++) + put_be32(hashout + i*4, ctx->H[i]); +} diff --git a/plugins/duda/packages/sha1/sha1.h b/plugins/duda/packages/sha1/sha1.h new file mode 100644 index 0000000..71ee621 --- /dev/null +++ b/plugins/duda/packages/sha1/sha1.h @@ -0,0 +1,50 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +/* Monkey HTTP Daemon + * ------------------ + * Copyright (C) 2001-2012, Eduardo Silva P. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef DUDA_PACKAGE_SHA1_H +#define DUDA_PACKAGE_SHA1_H +#include + +#define SHA_DIGEST_LENGTH 20 + +struct duda_api_sha1 { + void (*encode) (const void *, unsigned char *, unsigned long); +}; + +typedef struct duda_api_sha1 sha1_object_t; +sha1_object_t *sha1; + +typedef struct { + unsigned long long size; + unsigned int H[5]; + unsigned int W[16]; +} blk_SHA_CTX; + +void blk_SHA1_Init(blk_SHA_CTX *ctx); +void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len); +void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx); + +#define SHA_CTX blk_SHA_CTX +#define SHA1_Init blk_SHA1_Init +#define SHA1_Update blk_SHA1_Update +#define SHA1_Final blk_SHA1_Final + +#endif // DUDA_PACKAGE_SHA1_H -- 1.7.4.1