rootfs_split fixes

[openwrt.git] / 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 a7c2291..e371b32 100644 (file)
--- a/package/busybox/patches/913-libbb_hash.patch
+++ b/package/busybox/patches/913-libbb_hash.patch
@@ -1,14 +1,8 @@
-# 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.2.0-orig/coreutils/md5_sha1_sum.c busybox-1.2.0-libbb_hash/coreutils/md5_sha1_sum.c
---- busybox-1.2.0-orig/coreutils/md5_sha1_sum.c        2006-07-01 00:42:07.000000000 +0200
-+++ busybox-1.2.0-libbb_hash/coreutils/md5_sha1_sum.c  2006-07-22 17:08:02.000000000 +0200
-@@ -16,79 +16,10 @@
+Index: busybox-1.4.2/coreutils/md5_sha1_sum.c
+===================================================================
+--- busybox-1.4.2.orig/coreutils/md5_sha1_sum.c        2007-06-04 13:21:31.536182440 +0200
++++ busybox-1.4.2/coreutils/md5_sha1_sum.c     2007-06-04 13:21:37.709243992 +0200
+@@ -8,76 +8,10 @@

  
  #include "busybox.h"
  
  
  #include "busybox.h"
  


@@ -20,17 +14,12 @@ diff -ruN busybox-1.2.0-orig/coreutils/md5_sha1_sum.c busybox-1.2.0-libbb_hash/c
  
 -/* This might be useful elsewhere */
 -static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
  
 -/* 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]);
--      }
--      return (hex_value);
+-      /* xzalloc zero-terminates */
+-      char *hex_value = xzalloc((hash_length * 2) + 1);
+-      bin2hex(hex_value, (char*)hash_value, hash_length);
+-      return hex_value;

 -}
 -
 -static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
 -}
 -
 -static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)


@@ -45,11 +34,13 @@ diff -ruN busybox-1.2.0-orig/coreutils/md5_sha1_sum.c busybox-1.2.0-libbb_hash/c
 -      void (*update)(const void*, size_t, void*);
 -      void (*final)(void*, void*);
 -
 -      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 (NOT_LONE_DASH(filename)) {
+-              src_fd = open(filename, O_RDONLY);
+-              if (src_fd < 0) {
+-                      bb_perror_msg("%s", filename);
+-                      return NULL;
+-              }

 -      }
 -
 -      /* figure specific hash algorithims */
 -      }
 -
 -      /* figure specific hash algorithims */


@@ -67,7 +58,7 @@ diff -ruN busybox-1.2.0-orig/coreutils/md5_sha1_sum.c busybox-1.2.0-libbb_hash/c
 -              bb_error_msg_and_die("algorithm not supported");
 -      }
 -
 -              bb_error_msg_and_die("algorithm not supported");
 -      }
 -

--      while (0 < (count = read(src_fd, in_buf, 4096))) {
+-      while (0 < (count = safe_read(src_fd, in_buf, 4096))) {

 -              update(in_buf, count, &context);
 -      }
 -
 -              update(in_buf, count, &context);
 -      }
 -


@@ -85,36 +76,47 @@ diff -ruN busybox-1.2.0-orig/coreutils/md5_sha1_sum.c busybox-1.2.0-libbb_hash/c
 -      return hash_value;
 -}
 -
 -      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.2.0-orig/include/libbb.h busybox-1.2.0-libbb_hash/include/libbb.h
---- busybox-1.2.0-orig/include/libbb.h 2006-07-01 00:42:10.000000000 +0200
-+++ busybox-1.2.0-libbb_hash/include/libbb.h   2006-07-22 17:01:06.000000000 +0200
-@@ -518,6 +518,8 @@
- extern int get_terminal_width_height(int fd, int *width, int *height);
- extern unsigned long get_ug_id(const char *s, long (*__bb_getxxnam)(const char *));
+       int return_value = EXIT_SUCCESS;
+Index: busybox-1.4.2/include/libbb.h
+===================================================================
+--- busybox-1.4.2.orig/include/libbb.h 2007-06-04 13:21:35.388596784 +0200
++++ busybox-1.4.2/include/libbb.h      2007-06-04 13:21:37.709243992 +0200
+@@ -641,6 +641,7 @@
+ 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 enum { HASH_SHA1, HASH_MD5 } hash_algo_t;

-+
- typedef struct _sha1_ctx_t_ {
+ typedef struct sha1_ctx_t {

        uint32_t count[2];
        uint32_t hash[5];
        uint32_t count[2];
        uint32_t hash[5];

-@@ -542,6 +544,10 @@
+@@ -662,6 +663,8 @@
+ void md5_begin(md5_ctx_t *ctx);

  void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
  void *md5_end(void *resbuf, md5_ctx_t *ctx);
  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);
++unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned hash_length);

 +uint8_t *hash_file(const char *filename, hash_algo_t hash_algo);
 +uint8_t *hash_file(const char *filename, hash_algo_t hash_algo);

-+
- extern uint32_t *bb_crc32_filltable (int endian);

  
  

- #ifndef RB_POWER_OFF
-diff -ruN busybox-1.2.0-orig/libbb/hash.c busybox-1.2.0-libbb_hash/libbb/hash.c
---- busybox-1.2.0-orig/libbb/hash.c    1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.2.0-libbb_hash/libbb/hash.c      2006-07-22 17:07:34.000000000 +0200
-@@ -0,0 +1,100 @@
+ uint32_t *crc32_filltable(int endian);
+ 
+Index: busybox-1.4.2/libbb/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/libbb/Kbuild    2007-06-04 13:21:31.548180616 +0200
++++ busybox-1.4.2/libbb/Kbuild 2007-06-04 13:21:37.710243840 +0200
+@@ -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
+Index: busybox-1.4.2/libbb/hash.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/libbb/hash.c 2007-06-04 13:21:37.710243840 +0200
+@@ -0,0 +1,82 @@

 +/*
 + *  Copyright (C) 2003 Glenn L. McGrath
 + *  Copyright (C) 2003-2004 Erik Andersen
 +/*
 + *  Copyright (C) 2003 Glenn L. McGrath
 + *  Copyright (C) 2003-2004 Erik Andersen


@@ -132,97 +134,68 @@ diff -ruN busybox-1.2.0-orig/libbb/hash.c busybox-1.2.0-libbb_hash/libbb/hash.c
 +
 +#include "busybox.h"
 +
 +
 +#include "busybox.h"
 +

-+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length)
++/* This might be useful elsewhere */
++unsigned char *hash_bin_to_hex(unsigned char *hash_value,
++                              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]);
-+      }
-+      return (hex_value);
++      /* xzalloc zero-terminates */
++      char *hex_value = xzalloc((hash_length * 2) + 1);
++      bin2hex(hex_value, (char*)hash_value, hash_length);
++      return hex_value;

 +}
 +
 +}
 +

-+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)

 +{
 +{

-+      int count, result = 0;
++      int src_fd, hash_len, count;

 +      union _ctx_ {
 +              sha1_ctx_t sha1;
 +              md5_ctx_t md5;
 +      } context;
 +      union _ctx_ {
 +              sha1_ctx_t sha1;
 +              md5_ctx_t md5;
 +      } context;

++      uint8_t *hash_value = NULL;

 +      RESERVE_CONFIG_UBUFFER(in_buf, 4096);
 +      RESERVE_CONFIG_UBUFFER(in_buf, 4096);

-+      void (*update)(const void*, size_t, void*) = NULL;
-+      void (*final)(void*, void*) = NULL;
-+      
-+      // figure specific hash algorithims
++      void (*update)(const void*, size_t, void*);
++      void (*final)(void*, void*);
++
++      src_fd = STDIN_FILENO;
++      if (NOT_LONE_DASH(filename)) {
++              src_fd = open(filename, O_RDONLY);
++              if (src_fd < 0) {
++                      bb_perror_msg("%s", filename);
++                      return 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;
 +      if (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 (hash_algo==HASH_SHA1) {
 +              sha1_begin(&context.sha1);
 +              update = (void (*)(const void*, size_t, void*))sha1_hash;
 +              final = (void (*)(void*, void*))sha1_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;

++              hash_len = 20;
++      } else {
++              bb_error_msg_and_die("algorithm not supported");

 +      }
 +
 +      }
 +

-+
-+      while (0 < (count = read(fd, in_buf, sizeof in_buf))) {
++      while (0 < (count = safe_read(src_fd, in_buf, 4096))) {

 +              update(in_buf, count, &context);
 +              update(in_buf, count, &context);

-+              result += count;

 +      }
 +
 +      if (count == 0) {
 +      }
 +
 +      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");
++              final(in_buf, &context);
++              hash_value = hash_bin_to_hex(in_buf, hash_len);

 +      }
 +
 +      }
 +

-+      if (strcmp(filename, "-") == 0) {
-+              src_fd = STDIN_FILENO;
-+      } else if (0 > (src_fd = open(filename, O_RDONLY))) {
-+              bb_perror_msg("%s", filename);
-+              return NULL;
-+      }
++      RELEASE_CONFIG_BUFFER(in_buf);

 +
 +

-+      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);
 +      }
 +      if (src_fd != STDIN_FILENO) {
 +              close(src_fd);
 +      }

-+      
-+      RELEASE_CONFIG_BUFFER(hash_buf);

 +
 +      return hash_value;
 +}
 +
 +      return hash_value;
 +}

-diff -ruN busybox-1.2.0-orig/libbb/Makefile.in busybox-1.2.0-libbb_hash/libbb/Makefile.in
---- busybox-1.2.0-orig/libbb/Makefile.in       2006-07-01 00:42:08.000000000 +0200
-+++ busybox-1.2.0-libbb_hash/libbb/Makefile.in 2006-07-22 16:51:47.000000000 +0200
-@@ -11,6 +11,7 @@
- 
- 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 \
-       crc32.c create_icmp_socket.c create_icmp6_socket.c \
++
++