# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # # expose (again) an hash_fd function (used in 911-ipkg.patch) # diff -ruN busybox-1.3.1-orig/coreutils/md5_sha1_sum.c busybox-1.3.1-913/coreutils/md5_sha1_sum.c --- busybox-1.3.1-orig/coreutils/md5_sha1_sum.c 2006-12-27 05:54:50.000000000 +0100 +++ busybox-1.3.1-913/coreutils/md5_sha1_sum.c 2006-12-28 00:59:35.000000000 +0100 @@ -8,78 +8,10 @@ #include "busybox.h" -typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; - #define FLAG_SILENT 1 #define FLAG_CHECK 2 #define FLAG_WARN 4 -/* This might be useful elsewhere */ -static unsigned char *hash_bin_to_hex(unsigned char *hash_value, - unsigned hash_length) -{ - int len = 0; - char *hex_value = xmalloc((hash_length * 2) + 2); - while (hash_length--) { - len += sprintf(hex_value + len, "%02x", *hash_value++); - } - return hex_value; -} - -static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo) -{ - int src_fd, hash_len, count; - union _ctx_ { - sha1_ctx_t sha1; - md5_ctx_t md5; - } context; - uint8_t *hash_value = NULL; - RESERVE_CONFIG_UBUFFER(in_buf, 4096); - void (*update)(const void*, size_t, void*); - void (*final)(void*, void*); - - src_fd = STDIN_FILENO; - if (filename[0] != '-' || filename[1]) { /* not "-" */ - src_fd = open(filename, O_RDONLY); - if (src_fd < 0) { - bb_perror_msg("%s", filename); - return NULL; - } - } - - /* figure specific hash algorithims */ - if (ENABLE_MD5SUM && hash_algo==HASH_MD5) { - md5_begin(&context.md5); - update = (void (*)(const void*, size_t, void*))md5_hash; - final = (void (*)(void*, void*))md5_end; - hash_len = 16; - } else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { - sha1_begin(&context.sha1); - update = (void (*)(const void*, size_t, void*))sha1_hash; - final = (void (*)(void*, void*))sha1_end; - hash_len = 20; - } else { - bb_error_msg_and_die("algorithm not supported"); - } - - while (0 < (count = safe_read(src_fd, in_buf, 4096))) { - update(in_buf, count, &context); - } - - if (count == 0) { - final(in_buf, &context); - hash_value = hash_bin_to_hex(in_buf, hash_len); - } - - RELEASE_CONFIG_BUFFER(in_buf); - - if (src_fd != STDIN_FILENO) { - close(src_fd); - } - - return hash_value; -} - int md5_sha1_sum_main(int argc, char **argv) { int return_value = EXIT_SUCCESS; diff -ruN busybox-1.3.1-orig/include/libbb.h busybox-1.3.1-913/include/libbb.h --- busybox-1.3.1-orig/include/libbb.h 2006-12-27 05:56:18.000000000 +0100 +++ busybox-1.3.1-913/include/libbb.h 2006-12-27 23:25:52.000000000 +0100 @@ -528,6 +528,8 @@ extern const char bb_uuenc_tbl_std[]; void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl); +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + typedef struct sha1_ctx_t { uint32_t count[2]; uint32_t hash[5]; @@ -550,6 +552,10 @@ void md5_hash(const void *data, size_t length, md5_ctx_t *ctx); void *md5_end(void *resbuf, md5_ctx_t *ctx); +unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length); +int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value); +uint8_t *hash_file(const char *filename, hash_algo_t hash_algo); + uint32_t *crc32_filltable(int endian); diff -ruN busybox-1.3.1-orig/libbb/hash.c busybox-1.3.1-913/libbb/hash.c --- busybox-1.3.1-orig/libbb/hash.c 1970-01-01 01:00:00.000000000 +0100 +++ busybox-1.3.1-913/libbb/hash.c 2006-12-28 00:48:52.000000000 +0100 @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2003 Glenn L. McGrath + * Copyright (C) 2003-2004 Erik Andersen + * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "busybox.h" + +unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length) +{ + int len = 0; + char *hex_value = xmalloc((hash_length * 2) + 2); + while (hash_length--) { + len += sprintf(hex_value + len, "%02x", *hash_value++); + } + return hex_value; +} + +int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value) +{ + int count, result = 0; + union _ctx_ { + sha1_ctx_t sha1; + md5_ctx_t md5; + } context; + RESERVE_CONFIG_UBUFFER(in_buf, 4096); + void (*update)(const void*, size_t, void*) = NULL; + void (*final)(void*, void*) = NULL; + + // figure specific hash algorithims + if (hash_algo==HASH_MD5) { + md5_begin(&context.md5); + update = (void (*)(const void*, size_t, void*))md5_hash; + final = (void (*)(void*, void*))md5_end; + } else if (hash_algo==HASH_SHA1) { + sha1_begin(&context.sha1); + update = (void (*)(const void*, size_t, void*))sha1_hash; + final = (void (*)(void*, void*))sha1_end; + } + + + while (0 < (count = safe_read(fd, in_buf, sizeof in_buf))) { + update(in_buf, count, &context); + result += count; + } + + if (count == 0) { + final(hash_value, &context); + } + + RELEASE_CONFIG_BUFFER(in_buf); + + return result; +} + +uint8_t *hash_file(const char *filename, hash_algo_t hash_algo) +{ + int src_fd, hash_len; + RESERVE_CONFIG_UBUFFER(hash_buf, 20); + uint8_t *hash_value = NULL; + + if (ENABLE_MD5SUM && hash_algo==HASH_MD5) { + hash_len = 16; + } else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { + hash_len = 20; + } else { + bb_error_msg_and_die("algotithm not supported"); + } + + src_fd = STDIN_FILENO; + if (filename[0] != '-' || filename[1]) { /* not "-" */ + src_fd = open(filename, O_RDONLY); + if (src_fd < 0) { + bb_perror_msg("%s", filename); + return NULL; + } + } + + if (hash_fd(src_fd, hash_algo, hash_buf) > 0) { + hash_value = hash_bin_to_hex(hash_buf, hash_len); + } + + if (src_fd != STDIN_FILENO) { + close(src_fd); + } + + RELEASE_CONFIG_BUFFER(hash_buf); + + return hash_value; +} diff -ruN busybox-1.3.1-orig/libbb/Kbuild busybox-1.3.1-913/libbb/Kbuild --- busybox-1.3.1-orig/libbb/Kbuild 2006-12-27 05:55:04.000000000 +0100 +++ busybox-1.3.1-913/libbb/Kbuild 2006-12-27 23:31:20.000000000 +0100 @@ -37,6 +37,7 @@ lib-y += get_last_path_component.o lib-y += get_line_from_file.o lib-y += getopt32.o +lib-y += hash.o lib-y += herror_msg.o lib-y += herror_msg_and_die.o lib-y += human_readable.o