Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/md5_sha1_sum.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/md5_sha1_sum.c (modified) (7 diffs)

branches/2.2.9/mindi-busybox/coreutils/md5_sha1_sum.c

@@ -4 +4 @@
  *  Copyright (C) 2003-2004 Erik Andersen
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
+/* This is a NOEXEC applet. Be very careful! */
 
-#define FLAG_SILENT 1
-#define FLAG_CHECK  2
-#define FLAG_WARN   4
+enum {
+    /* 4th letter of applet_name is... */
+    HASH_MD5 = 's', /* "md5>s<um" */
+    HASH_SHA1 = '1',
+    HASH_SHA256 = '2',
+    HASH_SHA512 = '5',
+};
+
+#define FLAG_SILENT  1
+#define FLAG_CHECK   2
+#define FLAG_WARN    4
 
 /* This might be useful elsewhere */
@@ -22 +30 @@
     char *hex_value = xzalloc((hash_length * 2) + 1);
     bin2hex(hex_value, (char*)hash_value, hash_length);
-    return hex_value;
+    return (unsigned char *)hex_value;
 }
 
-static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
+static uint8_t *hash_file(const char *filename)
 {
     int src_fd, hash_len, count;
     union _ctx_ {
+        sha512_ctx_t sha512;
+        sha256_ctx_t sha256;
         sha1_ctx_t sha1;
         md5_ctx_t md5;
@@ -34 +44 @@
     uint8_t *hash_value = NULL;
     RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-    void (*update)(const void*, size_t, void*);
-    void (*final)(void*, void*);
+    void FAST_FUNC (*update)(void*, const void*, size_t);
+    void FAST_FUNC (*final)(void*, void*);
+    char hash_algo;
 
-    src_fd = STDIN_FILENO;
-    if (NOT_LONE_DASH(filename)) {
-        src_fd = open_or_warn(filename, O_RDONLY);
-        if (src_fd < 0) {
-            return NULL;
-        }
+    src_fd = open_or_warn_stdin(filename);
+    if (src_fd < 0) {
+        return NULL;
     }
 
+    hash_algo = applet_name[3];
+
     /* figure specific hash algorithims */
-    if (ENABLE_MD5SUM && hash_algo==HASH_MD5) {
+    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;
+        update = (void*)md5_hash;
+        final = (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;
+        update = (void*)sha1_hash;
+        final = (void*)sha1_end;
         hash_len = 20;
+    } else if (ENABLE_SHA256SUM && hash_algo == HASH_SHA256) {
+        sha256_begin(&context.sha256);
+        update = (void*)sha256_hash;
+        final = (void*)sha256_end;
+        hash_len = 32;
+    } else if (ENABLE_SHA512SUM && hash_algo == HASH_SHA512) {
+        sha512_begin(&context.sha512);
+        update = (void*)sha512_hash;
+        final = (void*)sha512_end;
+        hash_len = 64;
     } else {
-        bb_error_msg_and_die("algorithm not supported");
+        xfunc_die(); /* can't reach this */
     }
 
-    while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
-        update(in_buf, count, &context);
+    while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
+        update(&context, in_buf, count);
     }
 
     if (count == 0) {
-        final(in_buf, &context);
+        final(&context, in_buf);
         hash_value = hash_bin_to_hex(in_buf, hash_len);
     }
@@ -78 +98 @@
 }
 
-int md5_sha1_sum_main(int argc, char **argv);
-int md5_sha1_sum_main(int argc, char **argv)
+int md5_sha1_sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 {
     int return_value = EXIT_SUCCESS;
-    uint8_t *hash_value;
     unsigned flags;
-    hash_algo_t hash_algo = ENABLE_MD5SUM
-        ? (ENABLE_SHA1SUM ? (applet_name[0] == 'm' ? HASH_MD5 : HASH_SHA1) : HASH_MD5)
-        : HASH_SHA1;
 
-    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
-        flags = getopt32(argv, "scw");
-    else optind = 1;
+    if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
+        /* -b "binary", -t "text" are ignored (shaNNNsum compat) */
+        flags = getopt32(argv, "scwbt");
+        argv += optind;
+        //argc -= optind;
+    } else {
+        argv += 1;
+        //argc -= 1;
+    }
+    if (!*argv)
+        *--argv = (char*)"-";
 
     if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && !(flags & FLAG_CHECK)) {
         if (flags & FLAG_SILENT) {
-            bb_error_msg_and_die
-                ("-%c is meaningful only when verifying checksums", 's');
-        } else if (flags & FLAG_WARN) {
-            bb_error_msg_and_die
-                ("-%c is meaningful only when verifying checksums", 'w');
+            bb_error_msg_and_die("-%c is meaningful only with -c", 's');
         }
-    }
-
-    if (argc == optind) {
-        argv[argc++] = (char*)"-";
+        if (flags & FLAG_WARN) {
+            bb_error_msg_and_die("-%c is meaningful only with -c", 'w');
+        }
     }
 
@@ -110 +129 @@
         int count_total = 0;
         int count_failed = 0;
-        char *file_ptr = argv[optind];
         char *line;
 
-        if (optind + 1 != argc) {
-            bb_error_msg_and_die
-                ("only one argument may be specified when using -c");
+        if (argv[1]) {
+            bb_error_msg_and_die("only one argument may be specified with -c");
         }
 
-        pre_computed_stream = stdin;
-        if (NOT_LONE_DASH(file_ptr)) {
-            pre_computed_stream = xfopen(file_ptr, "r");
-        }
+        pre_computed_stream = xfopen_stdin(argv[0]);
 
-        while ((line = xmalloc_getline(pre_computed_stream)) != NULL) {
+        while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) {
+            uint8_t *hash_value;
             char *filename_ptr;
 
@@ -144 +159 @@
             filename_ptr += 2;
 
-            hash_value = hash_file(filename_ptr, hash_algo);
+            hash_value = hash_file(filename_ptr);
 
             if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
@@ -165 +180 @@
         /*
         if (fclose_if_not_stdin(pre_computed_stream) == EOF) {
-            bb_perror_msg_and_die("cannot close file %s", file_ptr);
+            bb_perror_msg_and_die("can't close file %s", file_ptr);
         }
         */
     } else {
-        while (optind < argc) {
-            char *file_ptr = argv[optind++];
-
-            hash_value = hash_file(file_ptr, hash_algo);
+        do {
+            uint8_t *hash_value = hash_file(*argv);
             if (hash_value == NULL) {
                 return_value = EXIT_FAILURE;
             } else {
-                printf("%s  %s\n", hash_value, file_ptr);
+                printf("%s  %s\n", hash_value, *argv);
                 free(hash_value);
             }
-        }
+        } while (*++argv);
     }
     return return_value;