more thorough fix for systems with strange socklen_t

[oweals/busybox.git] / coreutils / md5_sha1_sum.c

diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 080eac5f44f78342709424f0a9d5c3690efe51f3..a64026d3dd5a90c8e5019eb750b9ebcf8eeed039 100644 (file)
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -8,7 +8,13 @@
 
 #include "libbb.h"
 
-typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
+typedef enum {
+       /* 4th letter of applet_name is... */
+       HASH_MD5 = 's', /* "md5>s<um" */
+       HASH_SHA1 = '1',
+       HASH_SHA256 = '2',
+       HASH_SHA512 = '5',
+} hash_algo_t;
 
 #define FLAG_SILENT    1
 #define FLAG_CHECK     2
@@ -21,20 +27,23 @@ static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
        /* xzalloc zero-terminates */
        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 /*, hash_algo_t hash_algo*/)
 {
        int src_fd, hash_len, count;
        union _ctx_ {
+               sha512_ctx_t sha512;
+               sha256_ctx_t sha256;
                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*);
+       void FAST_FUNC (*update)(const void*, size_t, void*);
+       void FAST_FUNC (*final)(void*, void*);
+       hash_algo_t hash_algo = applet_name[3];
 
        src_fd = open_or_warn_stdin(filename);
        if (src_fd < 0) {
@@ -42,16 +51,26 @@ static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
        }
 
        /* 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");
        }
@@ -75,14 +94,12 @@ static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
 }
 
 int md5_sha1_sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int md5_sha1_sum_main(int argc ATTRIBUTE_UNUSED, char **argv)
+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;
+       /*hash_algo_t hash_algo = applet_name[3];*/
 
        if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
                flags = getopt32(argv, "scw");
@@ -115,7 +132,7 @@ int md5_sha1_sum_main(int argc ATTRIBUTE_UNUSED, char **argv)
 
                pre_computed_stream = xfopen_stdin(argv[0]);
 
-               while ((line = xmalloc_getline(pre_computed_stream)) != NULL) {
+               while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) {
                        char *filename_ptr;
 
                        count_total++;
@@ -136,7 +153,7 @@ int md5_sha1_sum_main(int argc ATTRIBUTE_UNUSED, char **argv)
                        *filename_ptr = '\0';
                        filename_ptr += 2;
 
-                       hash_value = hash_file(filename_ptr, hash_algo);
+                       hash_value = hash_file(filename_ptr /*, hash_algo*/);
 
                        if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
                                if (!(flags & FLAG_SILENT))
@@ -157,12 +174,12 @@ int md5_sha1_sum_main(int argc ATTRIBUTE_UNUSED, char **argv)
                }
                /*
                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 {
                do {
-                       hash_value = hash_file(*argv, hash_algo);
+                       hash_value = hash_file(*argv/*, hash_algo*/);
                        if (hash_value == NULL) {
                                return_value = EXIT_FAILURE;
                        } else {