6937487be7
Back in 2007, commit 0c97c9d437 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
354 lines
11 KiB
C
354 lines
11 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Copyright (C) 2003 Glenn L. McGrath
|
|
* Copyright (C) 2003-2004 Erik Andersen
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config MD5SUM
|
|
//config: bool "md5sum (6.5 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Compute and check MD5 message digest
|
|
//config:
|
|
//config:config SHA1SUM
|
|
//config: bool "sha1sum (5.9 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Compute and check SHA1 message digest
|
|
//config:
|
|
//config:config SHA256SUM
|
|
//config: bool "sha256sum (7 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Compute and check SHA256 message digest
|
|
//config:
|
|
//config:config SHA512SUM
|
|
//config: bool "sha512sum (7.4 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Compute and check SHA512 message digest
|
|
//config:
|
|
//config:config SHA3SUM
|
|
//config: bool "sha3sum (6.1 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Compute and check SHA3 message digest
|
|
//config:
|
|
//config:comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
|
|
//config: depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM
|
|
//config:
|
|
//config:config FEATURE_MD5_SHA1_SUM_CHECK
|
|
//config: bool "Enable -c, -s and -w options"
|
|
//config: default y
|
|
//config: depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM
|
|
//config: help
|
|
//config: Enabling the -c options allows files to be checked
|
|
//config: against pre-calculated hash values.
|
|
//config: -s and -w are useful options when verifying checksums.
|
|
|
|
//applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
|
|
//applet:IF_SHA1SUM(APPLET_NOEXEC(sha1sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha1sum))
|
|
//applet:IF_SHA3SUM(APPLET_NOEXEC(sha3sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha3sum))
|
|
//applet:IF_SHA256SUM(APPLET_NOEXEC(sha256sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha256sum))
|
|
//applet:IF_SHA512SUM(APPLET_NOEXEC(sha512sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha512sum))
|
|
|
|
//kbuild:lib-$(CONFIG_MD5SUM) += md5_sha1_sum.o
|
|
//kbuild:lib-$(CONFIG_SHA1SUM) += md5_sha1_sum.o
|
|
//kbuild:lib-$(CONFIG_SHA256SUM) += md5_sha1_sum.o
|
|
//kbuild:lib-$(CONFIG_SHA512SUM) += md5_sha1_sum.o
|
|
//kbuild:lib-$(CONFIG_SHA3SUM) += md5_sha1_sum.o
|
|
|
|
//usage:#define md5sum_trivial_usage
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
|
|
//usage:#define md5sum_full_usage "\n\n"
|
|
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums"
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
|
|
//usage: "\n -c Check sums against list in FILEs"
|
|
//usage: "\n -s Don't output anything, status code shows success"
|
|
//usage: "\n -w Warn about improperly formatted checksum lines"
|
|
//usage: )
|
|
//usage:
|
|
//usage:#define md5sum_example_usage
|
|
//usage: "$ md5sum < busybox\n"
|
|
//usage: "6fd11e98b98a58f64ff3398d7b324003\n"
|
|
//usage: "$ md5sum busybox\n"
|
|
//usage: "6fd11e98b98a58f64ff3398d7b324003 busybox\n"
|
|
//usage: "$ md5sum -c -\n"
|
|
//usage: "6fd11e98b98a58f64ff3398d7b324003 busybox\n"
|
|
//usage: "busybox: OK\n"
|
|
//usage: "^D\n"
|
|
//usage:
|
|
//usage:#define sha1sum_trivial_usage
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
|
|
//usage:#define sha1sum_full_usage "\n\n"
|
|
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums"
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
|
|
//usage: "\n -c Check sums against list in FILEs"
|
|
//usage: "\n -s Don't output anything, status code shows success"
|
|
//usage: "\n -w Warn about improperly formatted checksum lines"
|
|
//usage: )
|
|
//usage:
|
|
//usage:#define sha256sum_trivial_usage
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
|
|
//usage:#define sha256sum_full_usage "\n\n"
|
|
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums"
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
|
|
//usage: "\n -c Check sums against list in FILEs"
|
|
//usage: "\n -s Don't output anything, status code shows success"
|
|
//usage: "\n -w Warn about improperly formatted checksum lines"
|
|
//usage: )
|
|
//usage:
|
|
//usage:#define sha512sum_trivial_usage
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
|
|
//usage:#define sha512sum_full_usage "\n\n"
|
|
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums"
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
|
|
//usage: "\n -c Check sums against list in FILEs"
|
|
//usage: "\n -s Don't output anything, status code shows success"
|
|
//usage: "\n -w Warn about improperly formatted checksum lines"
|
|
//usage: )
|
|
//usage:
|
|
//usage:#define sha3sum_trivial_usage
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[-a BITS] [FILE]..."
|
|
//usage:#define sha3sum_full_usage "\n\n"
|
|
//usage: "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA3 checksums"
|
|
//usage: IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
|
|
//usage: "\n -c Check sums against list in FILEs"
|
|
//usage: "\n -s Don't output anything, status code shows success"
|
|
//usage: "\n -w Warn about improperly formatted checksum lines"
|
|
//usage: "\n -a BITS 224 (default), 256, 384, 512"
|
|
//usage: )
|
|
|
|
//FIXME: GNU coreutils 8.25 has no -s option, it has only these two long opts:
|
|
// --quiet don't print OK for each successfully verified file
|
|
// --status don't output anything, status code shows success
|
|
|
|
#include "libbb.h"
|
|
|
|
/* This is a NOEXEC applet. Be very careful! */
|
|
|
|
enum {
|
|
/* 4th letter of applet_name is... */
|
|
HASH_MD5 = 's', /* "md5>s<um" */
|
|
HASH_SHA1 = '1',
|
|
HASH_SHA256 = '2',
|
|
HASH_SHA3 = '3',
|
|
HASH_SHA512 = '5',
|
|
};
|
|
|
|
#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)
|
|
{
|
|
/* xzalloc zero-terminates */
|
|
char *hex_value = xzalloc((hash_length * 2) + 1);
|
|
bin2hex(hex_value, (char*)hash_value, hash_length);
|
|
return (unsigned char *)hex_value;
|
|
}
|
|
|
|
#if !ENABLE_SHA3SUM
|
|
# define hash_file(f,w) hash_file(f)
|
|
#endif
|
|
static uint8_t *hash_file(const char *filename, unsigned sha3_width)
|
|
{
|
|
int src_fd, hash_len, count;
|
|
union _ctx_ {
|
|
sha3_ctx_t sha3;
|
|
sha512_ctx_t sha512;
|
|
sha256_ctx_t sha256;
|
|
sha1_ctx_t sha1;
|
|
md5_ctx_t md5;
|
|
} context;
|
|
uint8_t *hash_value;
|
|
void FAST_FUNC (*update)(void*, const void*, size_t);
|
|
unsigned FAST_FUNC (*final)(void*, void*);
|
|
char hash_algo;
|
|
|
|
src_fd = open_or_warn_stdin(filename);
|
|
if (src_fd < 0) {
|
|
return NULL;
|
|
}
|
|
|
|
hash_algo = applet_name[3];
|
|
|
|
/* figure specific hash algorithms */
|
|
if (ENABLE_MD5SUM && hash_algo == HASH_MD5) {
|
|
md5_begin(&context.md5);
|
|
update = (void*)md5_hash;
|
|
final = (void*)md5_end;
|
|
hash_len = 16;
|
|
}
|
|
else if (ENABLE_SHA1SUM && hash_algo == HASH_SHA1) {
|
|
sha1_begin(&context.sha1);
|
|
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;
|
|
}
|
|
#if ENABLE_SHA3SUM
|
|
else if (ENABLE_SHA3SUM && hash_algo == HASH_SHA3) {
|
|
sha3_begin(&context.sha3);
|
|
update = (void*)sha3_hash;
|
|
final = (void*)sha3_end;
|
|
/*
|
|
* Should support 224, 256, 384, 512.
|
|
* We allow any value which does not blow the algorithm up.
|
|
*/
|
|
if (sha3_width >= 1600/2 /* input block can't be <= 0 */
|
|
|| sha3_width == 0 /* hash len can't be 0 */
|
|
|| (sha3_width & 0x1f) /* should be multiple of 32 */
|
|
/* (because input uses up to 8 byte wide word XORs. 32/4=8) */
|
|
) {
|
|
bb_error_msg_and_die("bad -a%u", sha3_width);
|
|
}
|
|
sha3_width /= 4;
|
|
context.sha3.input_block_bytes = 1600/8 - sha3_width;
|
|
hash_len = sha3_width/2;
|
|
}
|
|
#endif
|
|
else {
|
|
xfunc_die(); /* can't reach this */
|
|
}
|
|
|
|
{
|
|
RESERVE_CONFIG_UBUFFER(in_buf, 4096);
|
|
while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
|
|
update(&context, in_buf, count);
|
|
}
|
|
hash_value = NULL;
|
|
if (count < 0)
|
|
bb_perror_msg("can't read '%s'", filename);
|
|
else /* count == 0 */ {
|
|
final(&context, in_buf);
|
|
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) MAIN_EXTERNALLY_VISIBLE;
|
|
int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
int return_value = EXIT_SUCCESS;
|
|
unsigned flags;
|
|
#if ENABLE_SHA3SUM
|
|
unsigned sha3_width = 224;
|
|
#endif
|
|
|
|
if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
|
|
/* -b "binary", -t "text" are ignored (shaNNNsum compat) */
|
|
/* -s and -w require -c */
|
|
#if ENABLE_SHA3SUM
|
|
if (applet_name[3] == HASH_SHA3)
|
|
flags = getopt32(argv, "^" "scwbta:+" "\0" "s?c:w?c", &sha3_width);
|
|
else
|
|
#endif
|
|
flags = getopt32(argv, "^" "scwbt" "\0" "s?c:w?c");
|
|
} else {
|
|
#if ENABLE_SHA3SUM
|
|
if (applet_name[3] == HASH_SHA3)
|
|
getopt32(argv, "a:+", &sha3_width);
|
|
else
|
|
#endif
|
|
getopt32(argv, "");
|
|
}
|
|
argv += optind;
|
|
//argc -= optind;
|
|
if (!*argv)
|
|
*--argv = (char*)"-";
|
|
|
|
do {
|
|
if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
|
|
FILE *pre_computed_stream;
|
|
char *line;
|
|
int count_total = 0;
|
|
int count_failed = 0;
|
|
|
|
pre_computed_stream = xfopen_stdin(*argv);
|
|
|
|
while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) {
|
|
uint8_t *hash_value;
|
|
char *filename_ptr;
|
|
|
|
count_total++;
|
|
filename_ptr = strstr(line, " ");
|
|
/* handle format for binary checksums */
|
|
if (filename_ptr == NULL) {
|
|
filename_ptr = strstr(line, " *");
|
|
}
|
|
if (filename_ptr == NULL) {
|
|
if (flags & FLAG_WARN) {
|
|
bb_simple_error_msg("invalid format");
|
|
}
|
|
count_failed++;
|
|
return_value = EXIT_FAILURE;
|
|
free(line);
|
|
continue;
|
|
}
|
|
*filename_ptr = '\0';
|
|
filename_ptr += 2;
|
|
|
|
hash_value = hash_file(filename_ptr, sha3_width);
|
|
|
|
if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
|
|
if (!(flags & FLAG_SILENT))
|
|
printf("%s: OK\n", filename_ptr);
|
|
} else {
|
|
if (!(flags & FLAG_SILENT))
|
|
printf("%s: FAILED\n", filename_ptr);
|
|
count_failed++;
|
|
return_value = EXIT_FAILURE;
|
|
}
|
|
/* possible free(NULL) */
|
|
free(hash_value);
|
|
free(line);
|
|
}
|
|
if (count_failed && !(flags & FLAG_SILENT)) {
|
|
bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
|
|
count_failed, count_total);
|
|
}
|
|
if (count_total == 0) {
|
|
return_value = EXIT_FAILURE;
|
|
/*
|
|
* md5sum from GNU coreutils 8.25 says:
|
|
* md5sum: <FILE>: no properly formatted MD5 checksum lines found
|
|
*/
|
|
bb_error_msg("%s: no checksum lines found", *argv);
|
|
}
|
|
fclose_if_not_stdin(pre_computed_stream);
|
|
} else {
|
|
uint8_t *hash_value = hash_file(*argv, sha3_width);
|
|
if (hash_value == NULL) {
|
|
return_value = EXIT_FAILURE;
|
|
} else {
|
|
printf("%s %s\n", hash_value, *argv);
|
|
free(hash_value);
|
|
}
|
|
}
|
|
} while (*++argv);
|
|
|
|
return return_value;
|
|
}
|