X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cd0d52cbccd8c66fd7b28a35eb69efdc4231201f..7c1f76d32df1a0325477a0af03de547e1a94b220:/package/busybox/patches/913-libbb_hash.patch

diff --git a/package/busybox/patches/913-libbb_hash.patch b/package/busybox/patches/913-libbb_hash.patch
index 3a6a2ba1d..dc29bb05c 100644
--- a/package/busybox/patches/913-libbb_hash.patch
+++ b/package/busybox/patches/913-libbb_hash.patch
@@ -1,10 +1,14 @@
+# Copyright (C) 2006 OpenWrt.org
 #
-# expose (again) an hash_fd function (used 911-ipkg.patch)
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
-diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils/md5_sha1_sum.c
---- busybox-1.1.1-old/coreutils/md5_sha1_sum.c	2006-03-30 00:14:50.000000000 +0200
-+++ busybox-1.1.1-new/coreutils/md5_sha1_sum.c	2006-03-29 23:46:51.000000000 +0200
-@@ -15,80 +15,10 @@
+# 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"
  
@@ -16,17 +20,14 @@ diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils
  
 -/* This might be useful elsewhere */
 -static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
--									  unsigned char hash_length)
+-				unsigned hash_length)
 -{
--	int x, len, max;
--	unsigned char *hex_value;
--
--	max = (hash_length * 2) + 2;
--	hex_value = xmalloc(max);
--	for (x = len = 0; x < hash_length; x++) {
--		len += snprintf((char*)(hex_value + len), max - len, "%02x", hash_value[x]);
+-	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);
+-	return hex_value;
 -}
 -
 -static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
@@ -40,82 +41,79 @@ diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils
 -	RESERVE_CONFIG_UBUFFER(in_buf, 4096);
 -	void (*update)(const void*, size_t, void*);
 -	void (*final)(void*, void*);
--	
--	if(strcmp(filename, "-") == 0) {
--		src_fd = STDIN_FILENO;
--	} else if(0 > (src_fd = open(filename, O_RDONLY))) {
--		bb_perror_msg("%s", filename);
--		return NULL;
+-
+-	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) {
+-	/* 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) {
+-	} 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("algotithm not supported");
+-		bb_error_msg_and_die("algorithm not supported");
 -	}
--	
 -
--	while(0 < (count = read(src_fd, in_buf, sizeof in_buf))) {
+-	while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
 -		update(in_buf, count, &context);
 -	}
 -
--	if(count == 0) {
+-	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) {
+-
+-	if (src_fd != STDIN_FILENO) {
 -		close(src_fd);
 -	}
--	
+-
 -	return hash_value;
 -}
 -
- /* This could become a common function for md5 as well, by using md5_stream */
- static int hash_files(int argc, char **argv, hash_algo_t hash_algo)
+ int md5_sha1_sum_main(int argc, char **argv)
  {
-diff -ruN busybox-1.1.1-old/include/libbb.h busybox-1.1.1-new/include/libbb.h
---- busybox-1.1.1-old/include/libbb.h	2006-03-30 00:14:50.000000000 +0200
-+++ busybox-1.1.1-new/include/libbb.h	2006-03-30 00:31:48.000000000 +0200
-@@ -490,6 +490,12 @@
- void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
- void *md5_end(void *resbuf, md5_ctx_t *ctx);
+ 	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);
 +
- /* busybox.h will include dmalloc later for us, else include it here.  */
- #if !defined _BB_INTERNAL_H_ && defined DMALLOC
- #include <dmalloc.h>
-diff -ruN busybox-1.1.1-old/libbb/Makefile.in busybox-1.1.1-new/libbb/Makefile.in
---- busybox-1.1.1-old/libbb/Makefile.in	2006-03-30 00:14:50.000000000 +0200
-+++ busybox-1.1.1-new/libbb/Makefile.in	2006-03-29 23:46:51.000000000 +0200
-@@ -11,6 +11,7 @@
+ uint32_t *crc32_filltable(int endian);
+ 
  
- LIBBB-n:=
- LIBBB-y:= \
-+	hash.c \
- 	bb_asprintf.c ask_confirmation.c change_identity.c chomp.c \
- 	compare_string_array.c concat_path_file.c copy_file.c copyfd.c \
- 	create_icmp_socket.c create_icmp6_socket.c \
-diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
---- busybox-1.1.1-old/libbb/hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.1.1-new/libbb/hash.c	2006-03-30 00:35:54.000000000 +0200
-@@ -0,0 +1,100 @@
+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
@@ -135,15 +133,12 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
 +
 +unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length)
 +{
-+	int x, len, max;
-+	unsigned char *hex_value;
-+
-+	max = (hash_length * 2) + 2;
-+	hex_value = xmalloc(max);
-+	for (x = len = 0; x < hash_length; x++) {
-+		len += snprintf((char*)(hex_value + len), max - len, "%02x", hash_value[x]);
++	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);
++	return hex_value;
 +}
 +
 +int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value)
@@ -158,23 +153,23 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
 +	void (*final)(void*, void*) = NULL;
 +	
 +	// figure specific hash algorithims
-+	if(hash_algo==HASH_MD5) {
++	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) {
++	} 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 = read(fd, in_buf, sizeof in_buf))) {
++	while (0 < (count = safe_read(fd, in_buf, sizeof in_buf))) {
 +		update(in_buf, count, &context);
 +		result += count;
 +	}
 +
-+	if(count == 0) {
++	if (count == 0) {
 +		final(hash_value, &context);
 +	}
 +	
@@ -189,26 +184,28 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
 +	RESERVE_CONFIG_UBUFFER(hash_buf, 20);
 +	uint8_t *hash_value = NULL;
 +	
-+	if(ENABLE_MD5SUM && hash_algo==HASH_MD5) {
++	if (ENABLE_MD5SUM && hash_algo==HASH_MD5) {
 +		hash_len = 16;
-+	} else if(ENABLE_SHA1SUM && hash_algo==HASH_SHA1) {
++	} else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) {
 +		hash_len = 20;
 +	} else {
 +		bb_error_msg_and_die("algotithm not supported");
 +	}
 +
-+	if(strcmp(filename, "-") == 0) {
-+		src_fd = STDIN_FILENO;
-+	} else if(0 > (src_fd = open(filename, O_RDONLY))) {
-+		bb_perror_msg("%s", filename);
-+		return NULL;
++	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) {
++	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) {
++	if (src_fd != STDIN_FILENO) {
 +		close(src_fd);
 +	}
 +	
@@ -216,3 +213,14 @@ diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c
 +
 +	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