diff options
Diffstat (limited to '')
| -rw-r--r-- | src/common.c | 761 | ||||
| -rw-r--r-- | src/common.h | 53 | ||||
| -rw-r--r-- | src/completion | 40 | ||||
| -rw-r--r-- | src/keccak-224sum.c | 33 | ||||
| -rw-r--r-- | src/keccak-256sum.c | 33 | ||||
| -rw-r--r-- | src/keccak-384sum.c | 33 | ||||
| -rw-r--r-- | src/keccak-512sum.c | 33 | ||||
| -rw-r--r-- | src/keccaksum.c | 31 | ||||
| -rw-r--r-- | src/rawshake256sum.c | 33 | ||||
| -rw-r--r-- | src/rawshake512sum.c | 33 | ||||
| -rw-r--r-- | src/sha3-224sum.c | 33 | ||||
| -rw-r--r-- | src/sha3-256sum.c | 33 | ||||
| -rw-r--r-- | src/sha3-384sum.c | 33 | ||||
| -rw-r--r-- | src/sha3-512sum.c | 33 | ||||
| -rw-r--r-- | src/shake256sum.c | 33 | ||||
| -rw-r--r-- | src/shake512sum.c | 33 |
16 files changed, 463 insertions, 818 deletions
diff --git a/src/common.c b/src/common.c index 2e168f4..580ca72 100644 --- a/src/common.c +++ b/src/common.c @@ -1,65 +1,48 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" -#include <stdio.h> +#include <sys/stat.h> +#include <alloca.h> #include <errno.h> #include <fcntl.h> -#include <unistd.h> #include <stddef.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/stat.h> -#include <alloca.h> +#include <unistd.h> #ifndef STDIN_PATH # ifndef DEVDIR -# define DEVDIR "/dev" +# define DEVDIR "/dev" # endif -# define STDIN_PATH DEVDIR "/stdin" +# define STDIN_PATH DEVDIR"/stdin" #endif -#define USER_ERROR(string) \ - (fprintf(stderr, "%s: %s.\n", execname, string), 1) +#define USER_ERROR(string)\ + (fprintf(stderr, "%s: %s.\n", execname, string), 1) -#define ADD(arg, desc, ...) \ - (arg ? args_add_option(args_new_argumented(NULL, arg, 0, __VA_ARGS__, NULL), desc) \ - : args_add_option(args_new_argumentless(NULL, 0, __VA_ARGS__, NULL), desc)) +#define ADD(arg, desc, ...)\ + (arg ? args_add_option(args_new_argumented(NULL, arg, 0, __VA_ARGS__, NULL), desc)\ + : args_add_option(args_new_argumentless(NULL, 0, __VA_ARGS__, NULL), desc)) -#define LAST(arg) \ - (args_opts_get(arg)[args_opts_get_count(arg) - 1]) +#define LAST(arg)\ + (args_opts_get(arg)[args_opts_get_count(arg) - 1]) /** * Storage for binary hash */ -static char* restrict hashsum = NULL; +static char *restrict hashsum = NULL; /** * Storage for hexadecimal hash */ -static char* restrict hexsum = NULL; +static char *restrict hexsum = NULL; /** * Storage for binary version of expected checksum @@ -74,7 +57,7 @@ static int bad_found = 0; /** * `argv[0]` from `main` */ -static char* execname; +static char *execname; @@ -90,44 +73,42 @@ static char* execname; * at least `(spec->output / 8) * sizeof(char)`, may be `NULL` * @return Zero on success, -1 on error */ -__attribute__((nonnull(2, 3))) -static int generalised_sum_fd_hex(int fd, libkeccak_state_t* restrict state, - const libkeccak_spec_t* restrict spec, - const char* restrict suffix, char* restrict hash) +static int +generalised_sum_fd_hex(int fd, libkeccak_state_t *restrict state, + const libkeccak_spec_t *restrict spec, + const char *restrict suffix, char *restrict hash) { - ssize_t got; - struct stat attr; - size_t blksize = 4096, r_ptr = 0, w_ptr = 0; - char* restrict chunk; - char even = 1, buf = 0, c; - - if (libkeccak_state_initialise(state, spec) < 0) - return -1; - - if (fstat(fd, &attr) == 0) - if (attr.st_blksize > 0) - blksize = (size_t)(attr.st_blksize); - - chunk = alloca(blksize); - - for (;;) - { - got = read(fd, chunk, blksize); - if (got < 0) return -1; - if (got == 0) break; - while (r_ptr < (size_t)got) - { - if (c = chunk[r_ptr++], c <= ' ') - continue; - buf = (buf << 4) | ((c & 15) + (c > '9' ? 9 : 0)); - if ((even ^= 1)) - chunk[w_ptr++] = buf; + ssize_t got; + struct stat attr; + size_t blksize = 4096, r_ptr = 0, w_ptr = 0; + char *restrict chunk; + char even = 1, buf = 0, c; + + if (libkeccak_state_initialise(state, spec) < 0) + return -1; + + if (fstat(fd, &attr) == 0) + if (attr.st_blksize > 0) + blksize = (size_t)(attr.st_blksize); + + chunk = alloca(blksize); + + for (;;) { + got = read(fd, chunk, blksize); + if (got < 0) return -1; + if (!got) break; + while (r_ptr < (size_t)got) { + if (c = chunk[r_ptr++], c <= ' ') + continue; + buf = (buf << 4) | ((c & 15) + (c > '9' ? 9 : 0)); + if ((even ^= 1)) + chunk[w_ptr++] = buf; + } + if (libkeccak_fast_update(state, chunk, w_ptr) < 0) + return -1; } - if (libkeccak_fast_update(state, chunk, w_ptr) < 0) - return -1; - } - - return libkeccak_fast_digest(state, NULL, 0, 0, suffix, hash); + + return libkeccak_fast_digest(state, NULL, 0, 0, suffix, hash); } @@ -138,49 +119,50 @@ static int generalised_sum_fd_hex(int fd, libkeccak_state_t* restrict state, * @param spec See `libkeccak_degeneralise_spec` * @return Zero on success, an appropriate exit value on error */ -static int make_spec(libkeccak_generalised_spec_t* restrict gspec, libkeccak_spec_t* restrict spec) +static int +make_spec(libkeccak_generalised_spec_t *restrict gspec, libkeccak_spec_t *restrict spec) { - int r; - + int r; + #define TEST(CASE, STR) case LIBKECCAK_GENERALISED_SPEC_ERROR_##CASE: return USER_ERROR(STR) - if (r = libkeccak_degeneralise_spec(gspec, spec), r) - switch (r) - { - TEST (STATE_NONPOSITIVE, "the state size must be positive"); - TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); - TEST (STATE_MOD_25, "the state size must be a multiple of 25"); - TEST (WORD_NONPOSITIVE, "the word size must be positive"); - TEST (WORD_TOO_LARGE, "the word size is too large, may not exceed 64"); - TEST (STATE_WORD_INCOHERENCY, "the state size must be exactly 25 times the word size"); - TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); - TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); - TEST (BITRATE_NONPOSITIVE, "the rate must be positive"); - TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); - TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); - default: - return USER_ERROR("unknown error in algorithm parameters"); - } + if (r = libkeccak_degeneralise_spec(gspec, spec), r) { + switch (r) { + TEST (STATE_NONPOSITIVE, "the state size must be positive"); + TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); + TEST (STATE_MOD_25, "the state size must be a multiple of 25"); + TEST (WORD_NONPOSITIVE, "the word size must be positive"); + TEST (WORD_TOO_LARGE, "the word size is too large, may not exceed 64"); + TEST (STATE_WORD_INCOHERENCY, "the state size must be exactly 25 times the word size"); + TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); + TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); + TEST (BITRATE_NONPOSITIVE, "the rate must be positive"); + TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); + TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); + default: + return USER_ERROR("unknown error in algorithm parameters"); + } + } #undef TEST - + #define TEST(CASE, STR) case LIBKECCAK_SPEC_ERROR_##CASE: return USER_ERROR(STR) - if (r = libkeccak_spec_check(spec), r) - switch (r) - { - TEST (BITRATE_NONPOSITIVE, "the rate size must be positive"); - TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); - TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); - TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); - TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); - TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); - TEST (STATE_MOD_25, "the state size must be a multiple of 25"); - TEST (WORD_NON_2_POTENT, "the word size must be a power of 2"); - TEST (WORD_MOD_8, "the word size must be a multiple of 8"); - default: - return USER_ERROR("unknown error in algorithm parameters"); - } + if (r = libkeccak_spec_check(spec), r) { + switch (r) { + TEST (BITRATE_NONPOSITIVE, "the rate size must be positive"); + TEST (BITRATE_MOD_8, "the rate must be a multiple of 8"); + TEST (CAPACITY_NONPOSITIVE, "the capacity must be positive"); + TEST (CAPACITY_MOD_8, "the capacity must be a multiple of 8"); + TEST (OUTPUT_NONPOSITIVE, "the output size must be positive"); + TEST (STATE_TOO_LARGE, "the state size is too large, may not exceed 1600"); + TEST (STATE_MOD_25, "the state size must be a multiple of 25"); + TEST (WORD_NON_2_POTENT, "the word size must be a power of 2"); + TEST (WORD_MOD_8, "the word size must be a multiple of 8"); + default: + return USER_ERROR("unknown error in algorithm parameters"); + } + } #undef TEST - - return 0; + + return 0; } @@ -194,36 +176,35 @@ static int make_spec(libkeccak_generalised_spec_t* restrict gspec, libkeccak_spe * @param hex Whether to use hexadecimal input rather than binary * @return Zero on success, an appropriate exit value on error */ -static int hash(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int hex) +static int +hash(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int hex) { - libkeccak_state_t state; - size_t length; - int r, fd; - - length = (size_t)((spec->output + 7) / 8); - - if (hashsum == NULL) - if (hashsum = malloc(length * sizeof(char)), hashsum == NULL) - return perror(execname), 2; - - if (hexsum == NULL) - if (hexsum = malloc((length * 2 + 1) * sizeof(char)), hexsum == NULL) - return perror(execname), 2; - - if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) - return r = (errno != ENOENT), perror(execname), r + 1; - - if ((hex == 0 ? libkeccak_generalised_sum_fd : generalised_sum_fd_hex) - (fd, &state, spec, suffix, squeezes > 1 ? NULL : hashsum)) - return perror(execname), close(fd), libkeccak_state_fast_destroy(&state), 2; - close(fd); - - if (squeezes > 2) libkeccak_fast_squeeze(&state, squeezes - 2); - if (squeezes > 1) libkeccak_squeeze(&state, hashsum); - libkeccak_state_fast_destroy(&state); - - return 0; + libkeccak_state_t state; + size_t length; + int r, fd; + + length = (size_t)((spec->output + 7) / 8); + + if (!hashsum && (hashsum = malloc(length * sizeof(char)), !hashsum)) + return perror(execname), 2; + + if (!hexsum && (hexsum = malloc((length * 2 + 1) * sizeof(char)), !hexsum)) + return perror(execname), 2; + + if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) + return r = (errno != ENOENT), perror(execname), r + 1; + + if ((hex == 0 ? libkeccak_generalised_sum_fd : generalised_sum_fd_hex) + (fd, &state, spec, suffix, squeezes > 1 ? NULL : hashsum)) + return perror(execname), close(fd), libkeccak_state_fast_destroy(&state), 2; + close(fd); + + if (squeezes > 2) libkeccak_fast_squeeze(&state, squeezes - 2); + if (squeezes > 1) libkeccak_squeeze(&state, hashsum); + libkeccak_state_fast_destroy(&state); + + return 0; } @@ -239,28 +220,28 @@ static int hash(const char* restrict filename, const libkeccak_spec_t* restrict * @param correct_hash The expected checksum (any form of hexadecimal) * @return Zero on success, an appropriate exit value on error */ -static int check(const libkeccak_spec_t* restrict spec, long squeezes, const char* restrict suffix, - int hex, const char* restrict filename, const char* restrict correct_hash) +static int +check(const libkeccak_spec_t *restrict spec, long squeezes, const char *restrict suffix, + int hex, const char *restrict filename, const char *restrict correct_hash) { - size_t length = (size_t)((spec->output + 7) / 8); - int r; - - if (access(filename, F_OK)) - { - bad_found = 1; - printf("%s: %s\n", filename, "Missing"); - return 0; - } - - if ((r = hash(filename, spec, squeezes, suffix, hex))) - return r; - - libkeccak_unhex(correct_binary, correct_hash); - if ((r = memcmp(correct_binary, hashsum, length))) - bad_found = 1; - printf("%s: %s\n", filename, !r ? "OK" : "Fail"); - - return 0; + size_t length = (size_t)((spec->output + 7) / 8); + int r; + + if (access(filename, F_OK)) { + bad_found = 1; + printf("%s: %s\n", filename, "Missing"); + return 0; + } + + if ((r = hash(filename, spec, squeezes, suffix, hex))) + return r; + + libkeccak_unhex(correct_binary, correct_hash); + if ((r = memcmp(correct_binary, hashsum, length))) + bad_found = 1; + printf("%s: %s\n", filename, !r ? "OK" : "Fail"); + + return 0; } @@ -275,144 +256,128 @@ static int check(const libkeccak_spec_t* restrict spec, long squeezes, const cha * @param hex Whether to use hexadecimal input rather than binary * @return Zero on success, an appropriate exit value on error */ -static int check_checksums(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int representation, int hex) +static int +check_checksums(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int representation, int hex) { - struct stat attr; - size_t blksize = 4096; - size_t size = 4096; - size_t ptr = 0; - ssize_t got; - char* buf = NULL; - char* new; - int fd = -1, rc = 2, stage, r; - size_t hash_start = 0, hash_end = 0; - size_t file_start = 0, file_end = 0; - char* hash; - char* file; - size_t hash_n; - - if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) - goto pfail; - - if (fstat(fd, &attr) == 0) - { - if (attr.st_blksize > 0) blksize = (size_t)(attr.st_blksize); - if (attr.st_size > 0) size = (size_t)(attr.st_size); - } - - size = size > blksize ? size : blksize; - if (buf = malloc(size), buf == NULL) - goto pfail; - - for (;;) - { - if (ptr + blksize < size) - { - if (new = realloc(buf, size <<= 1), new == NULL) - goto pfail; - buf = new; - } - - got = read(fd, buf + ptr, blksize); - if (got < 0) goto pfail; - else if (got == 0) break; - else ptr += (size_t)got; - } - if (ptr == size) - { - if (new = realloc(buf, size + 1), new == NULL) - goto pfail; - buf = new; - } - size = ptr; - close(fd), fd = -1; - buf[size++] = '\n'; - - for (ptr = 0, stage = 0; ptr < size; ptr++) - { - char c = buf[ptr]; - if (stage == 0) - { - if (('0' <= c) && (c <= '9')); - else if (('a' <= c) && (c <= 'f')); - else if (('A' <= c) && (c <= 'F')); - else if ((c == ' ') || (c == '\t')) - hash_end = ptr, stage++; - else if ((c == '\n') || (c == '\f') || (c == '\r')) - hash_end = ptr, stage = 3; - else - { - rc = USER_ERROR("file is malformated"); - goto fail; - } + struct stat attr; + size_t blksize = 4096; + size_t size = 4096; + size_t ptr = 0; + ssize_t got; + char *buf = NULL; + char *new; + int fd = -1, rc = 2, stage, r; + size_t hash_start = 0, hash_end = 0; + size_t file_start = 0, file_end = 0; + char *hash; + char *file; + size_t hash_n; + char c; + + if (fd = open(strcmp(filename, "-") ? filename : STDIN_PATH, O_RDONLY), fd < 0) + goto pfail; + + if (fstat(fd, &attr) == 0) { + if (attr.st_blksize > 0) blksize = (size_t)(attr.st_blksize); + if (attr.st_size > 0) size = (size_t)(attr.st_size); } - else if (stage == 1) - { - if ((c == '\n') || (c == '\f') || (c == '\r')) - stage = 3; - else if ((c != ' ') && (c != '\t')) - file_start = ptr, stage++; + + size = size > blksize ? size : blksize; + if (buf = malloc(size), buf == NULL) + goto pfail; + + for (;;) { + if (ptr + blksize < size) { + if (new = realloc(buf, size <<= 1), new == NULL) + goto pfail; + buf = new; + } + + got = read(fd, buf + ptr, blksize); + if (got < 0) goto pfail; + else if (got == 0) break; + else ptr += (size_t)got; } - else if (stage == 2) - { - if ((c == '\n') || (c == '\f') || (c == '\r')) - file_end = ptr, stage++; + if (ptr == size) { + if (new = realloc(buf, size + 1), new == NULL) + goto pfail; + buf = new; } - - if (stage == 3) - { - if ((hash_start == hash_end) != (file_start == file_end)) - { - rc = USER_ERROR("file is malformated"); - goto fail; - } - if (hash_start != hash_end) - { - hash = buf + hash_start; - file = buf + file_start; - hash_n = hash_end - hash_start; - buf[hash_end] = '\0'; - buf[file_end] = '\0'; - if (hash_n % 2) - { - rc = USER_ERROR("file is malformated"); - goto fail; - } - if (hash_n / 2 != (size_t)((spec->output + 7) / 8)) - { - rc = USER_ERROR("algorithm parameter mismatch"); - goto fail; + size = ptr; + close(fd), fd = -1; + buf[size++] = '\n'; + + for (ptr = 0, stage = 0; ptr < size; ptr++) { + c = buf[ptr]; + if (stage == 0) { + if (('0' <= c) && (c <= '9')); + else if (('a' <= c) && (c <= 'f')); + else if (('A' <= c) && (c <= 'F')); + else if ((c == ' ') || (c == '\t')) { + hash_end = ptr, stage++; + } else if ((c == '\n') || (c == '\f') || (c == '\r')) { + hash_end = ptr, stage = 3; + } else { + rc = USER_ERROR("file is malformated"); + goto fail; + } + } else if (stage == 1) { + if ((c == '\n') || (c == '\f') || (c == '\r')) + stage = 3; + else if ((c != ' ') && (c != '\t')) + file_start = ptr, stage++; + } else if (stage == 2) { + if ((c == '\n') || (c == '\f') || (c == '\r')) + file_end = ptr, stage++; } - if ((r = check(spec, squeezes, suffix, hex, file, hash))) - { - rc = r; - goto fail; + + if (stage == 3) { + if ((hash_start == hash_end) != (file_start == file_end)) { + rc = USER_ERROR("file is malformated"); + goto fail; + } + if (hash_start != hash_end) { + hash = buf + hash_start; + file = buf + file_start; + hash_n = hash_end - hash_start; + buf[hash_end] = '\0'; + buf[file_end] = '\0'; + if (hash_n % 2) { + rc = USER_ERROR("file is malformated"); + goto fail; + } + if (hash_n / 2 != (size_t)((spec->output + 7) / 8)) { + rc = USER_ERROR("algorithm parameter mismatch"); + goto fail; + } + if ((r = check(spec, squeezes, suffix, hex, file, hash))) { + rc = r; + goto fail; + } + } + stage = 0; + hash_start = hash_end = file_start = file_end = ptr + 1; } - } - stage = 0; - hash_start = hash_end = file_start = file_end = ptr + 1; } - } - - if (stage) - { - rc = USER_ERROR("file is malformated"); - goto fail; - } - - free(buf); - return 0; - - pfail: - perror(execname); - fail: - free(buf); - if (fd >= 0) - close(fd); - return rc; - - (void) representation; + + if (stage) { + rc = USER_ERROR("file is malformated"); + goto fail; + } + + free(buf); + return 0; + +pfail: + perror(execname); +fail: + free(buf); + if (fd >= 0) + close(fd); + return rc; + + (void) representation; } @@ -428,50 +393,46 @@ static int check_checksums(const char* restrict filename, const libkeccak_spec_t * @param hex Whether to use hexadecimal input rather than binary * @return Zero on success, an appropriate exit value on error */ -static int print_checksum(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int representation, int hex) +static int +print_checksum(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int representation, int hex) { - size_t length = (size_t)((spec->output + 7) / 8); - int r; - - if ((r = hash(filename, spec, squeezes, suffix, hex))) - return r; - - if (representation == REPRESENTATION_UPPER_CASE) - { - libkeccak_behex_upper(hexsum, hashsum, length); - printf("%s %s\n", hexsum, filename); - } - else if (representation == REPRESENTATION_LOWER_CASE) - { - libkeccak_behex_lower(hexsum, hashsum, length); - printf("%s %s\n", hexsum, filename); - } - else - { - size_t ptr = 0; - ssize_t wrote; - fflush(stdout); - while (length - ptr) - { - wrote = write(STDOUT_FILENO, hashsum, length - ptr); - if (wrote <= 0) - return perror(execname), 2; - ptr += (size_t)wrote; + size_t length = (size_t)((spec->output + 7) / 8); + int r; + size_t ptr = 0; + ssize_t wrote; + + if ((r = hash(filename, spec, squeezes, suffix, hex))) + return r; + + if (representation == REPRESENTATION_UPPER_CASE) { + libkeccak_behex_upper(hexsum, hashsum, length); + printf("%s %s\n", hexsum, filename); + } else if (representation == REPRESENTATION_LOWER_CASE) { + libkeccak_behex_lower(hexsum, hashsum, length); + printf("%s %s\n", hexsum, filename); + } else { + fflush(stdout); + while (length - ptr) { + wrote = write(STDOUT_FILENO, hashsum, length - ptr); + if (wrote <= 0) + return perror(execname), 2; + ptr += (size_t)wrote; + } } - } - - return 0; + + return 0; } /** * Cleanup allocations */ -static inline void cleanup(void) +static inline void +cleanup(void) { - free(hashsum), hashsum = NULL; - free(hexsum), hexsum = NULL; + free(hashsum), hashsum = NULL; + free(hexsum), hexsum = NULL; } @@ -484,82 +445,82 @@ static inline void cleanup(void) * @param suffix Message suffix * @return An appropriate exit value */ -int run(int argc, char* argv[], libkeccak_generalised_spec_t* restrict gspec, const char* restrict suffix) +int +run(int argc, char *argv[], libkeccak_generalised_spec_t *restrict gspec, const char *restrict suffix) { - int r, verbose = 0, presentation = REPRESENTATION_UPPER_CASE, hex = 0, check = 0; - long squeezes = 1; - size_t i; - libkeccak_spec_t spec; - int (*fun)(const char* restrict filename, const libkeccak_spec_t* restrict spec, - long squeezes, const char* restrict suffix, int representation, int hex); - - execname = *argv; - - ADD(NULL, "Display option summary", "-h", "--help"); - ADD("RATE", "Select rate", "-R", "--bitrate", "--rate"); - ADD("CAPACITY", "Select capacity", "-C", "--capacity"); - ADD("SIZE", "Select output size", "-N", "-O", "--output-size", "--output"); - ADD("SIZE", "Select state size", "-S", "-B", "--state-size", "--state"); - ADD("SIZE", "Select word size", "-W", "--word-size", "--word"); - ADD("COUNT", "Select squeeze count", "-Z", "--squeezes"); - ADD(NULL, "Use upper-case output", "-u", "--upper", "--uppercase", "--upper-case"); - ADD(NULL, "Use lower-case output", "-l", "--lower", "--lowercase", "--lower-case"); - ADD(NULL, "Use binary output", "-b", "--binary"); - ADD(NULL, "Use hexadecimal input", "-x", "--hex", "--hex-input"); - ADD(NULL, "Check checksums", "-c", "--check"); - ADD(NULL, "Be verbose", "-v", "--verbose"); - /* --check has been added because the sha1sum, sha256sum &c have it, - * but I ignore the other crap, mostly because not all implemention - * have them and binary vs text mode is stupid. */ - - args_parse(argc, argv); - - if (args_opts_used("-h")) return args_help(0), args_dispose(), 0; - if (args_opts_used("-R")) gspec->bitrate = atol(LAST("-R")); - if (args_opts_used("-C")) gspec->capacity = atol(LAST("-C")); - if (args_opts_used("-N")) gspec->output = atol(LAST("-N")); - if (args_opts_used("-S")) gspec->state_size = atol(LAST("-S")); - if (args_opts_used("-W")) gspec->word_size = atol(LAST("-W")); - if (args_opts_used("-Z")) squeezes = atol(LAST("-Z")); - if (args_opts_used("-u")) presentation = REPRESENTATION_UPPER_CASE; - if (args_opts_used("-l")) presentation = REPRESENTATION_LOWER_CASE; - if (args_opts_used("-b")) presentation = REPRESENTATION_BINARY; - if (args_opts_used("-x")) hex = 1; - if (args_opts_used("-c")) check = 1; - if (args_opts_used("-v")) verbose = 1; - - fun = check ? check_checksums : print_checksum; - - if ((r = make_spec(gspec, &spec))) - goto done; - - if (squeezes <= 0) - { - r = USER_ERROR("the squeeze count most be positive"); - goto done; - } - - if (verbose) - { - fprintf(stderr, "rate: %li\n", gspec->bitrate); - fprintf(stderr, "capacity: %li\n", gspec->capacity); - fprintf(stderr, "output size: %li\n", gspec->output); - fprintf(stderr, "state size: %li\n", gspec->state_size); - fprintf(stderr, "word size: %li\n", gspec->word_size); - fprintf(stderr, "squeezes: %li\n", squeezes); - fprintf(stderr, "suffix: %s\n", suffix ? suffix : ""); - } - - if (args_files_count == 0) - r = fun("-", &spec, squeezes, suffix, presentation, hex); - else - for (i = 0; i < (size_t)args_files_count; i++) - if ((r = fun(args_files[i], &spec, squeezes, suffix, presentation, hex))) - break; - - done: - args_dispose(); - cleanup(); - return r ? r : bad_found; + int r, verbose = 0, presentation = REPRESENTATION_UPPER_CASE, hex = 0, check = 0; + long squeezes = 1; + size_t i; + libkeccak_spec_t spec; + int (*fun)(const char *restrict filename, const libkeccak_spec_t *restrict spec, + long squeezes, const char *restrict suffix, int representation, int hex); + + execname = *argv; + + ADD(NULL, "Display option summary", "-h", "--help"); + ADD("RATE", "Select rate", "-R", "--bitrate", "--rate"); + ADD("CAPACITY", "Select capacity", "-C", "--capacity"); + ADD("SIZE", "Select output size", "-N", "-O", "--output-size", "--output"); + ADD("SIZE", "Select state size", "-S", "-B", "--state-size", "--state"); + ADD("SIZE", "Select word size", "-W", "--word-size", "--word"); + ADD("COUNT", "Select squeeze count", "-Z", "--squeezes"); + ADD(NULL, "Use upper-case output", "-u", "--upper", "--uppercase", "--upper-case"); + ADD(NULL, "Use lower-case output", "-l", "--lower", "--lowercase", "--lower-case"); + ADD(NULL, "Use binary output", "-b", "--binary"); + ADD(NULL, "Use hexadecimal input", "-x", "--hex", "--hex-input"); + ADD(NULL, "Check checksums", "-c", "--check"); + ADD(NULL, "Be verbose", "-v", "--verbose"); + /* --check has been added because the sha1sum, sha256sum &c have it, + * but I ignore the other crap, mostly because not all implemention + * have them and binary vs text mode is stupid. */ + + args_parse(argc, argv); + + if (args_opts_used("-h")) return args_help(0), args_dispose(), 0; + if (args_opts_used("-R")) gspec->bitrate = atol(LAST("-R")); + if (args_opts_used("-C")) gspec->capacity = atol(LAST("-C")); + if (args_opts_used("-N")) gspec->output = atol(LAST("-N")); + if (args_opts_used("-S")) gspec->state_size = atol(LAST("-S")); + if (args_opts_used("-W")) gspec->word_size = atol(LAST("-W")); + if (args_opts_used("-Z")) squeezes = atol(LAST("-Z")); + if (args_opts_used("-u")) presentation = REPRESENTATION_UPPER_CASE; + if (args_opts_used("-l")) presentation = REPRESENTATION_LOWER_CASE; + if (args_opts_used("-b")) presentation = REPRESENTATION_BINARY; + if (args_opts_used("-x")) hex = 1; + if (args_opts_used("-c")) check = 1; + if (args_opts_used("-v")) verbose = 1; + + fun = check ? check_checksums : print_checksum; + + if ((r = make_spec(gspec, &spec))) + goto done; + + if (squeezes <= 0) { + r = USER_ERROR("the squeeze count most be positive"); + goto done; + } + + if (verbose) { + fprintf(stderr, "rate: %li\n", gspec->bitrate); + fprintf(stderr, "capacity: %li\n", gspec->capacity); + fprintf(stderr, "output size: %li\n", gspec->output); + fprintf(stderr, "state size: %li\n", gspec->state_size); + fprintf(stderr, "word size: %li\n", gspec->word_size); + fprintf(stderr, "squeezes: %li\n", squeezes); + fprintf(stderr, "suffix: %s\n", suffix ? suffix : ""); + } + + if (args_files_count == 0) { + r = fun("-", &spec, squeezes, suffix, presentation, hex); + } else { + for (i = 0; i < (size_t)args_files_count; i++) + if ((r = fun(args_files[i], &spec, squeezes, suffix, presentation, hex))) + break; + } + +done: + args_dispose(); + cleanup(); + return r ? r : bad_found; } diff --git a/src/common.h b/src/common.h index 8246e6c..e3182dc 100644 --- a/src/common.h +++ b/src/common.h @@ -1,32 +1,9 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef SHA3SUM_COMMON_H -#define SHA3SUM_COMMON_H 1 - - +/* See LICENSE file for copyright and license details. */ #include <libkeccak.h> #include <argparser.h> - -#define libkeccak_spec_keccak libkeccak_spec_sha3 -#define LIBKECCAK_KECCAK_SUFFIX "" - +#define libkeccak_spec_keccak libkeccak_spec_sha3 +#define LIBKECCAK_KECCAK_SUFFIX "" /** @@ -36,29 +13,27 @@ * @param prog The name of program, must be a string literal * @param suffix The message suffix */ -#define RUN(algo, prog, suffix) \ - (args_init(algo " checksum calculator", \ - prog " [options...] [--] [files...]", NULL, \ - NULL, 1, 0, args_standard_abbreviations), \ - run(argc, argv, &spec, suffix)) - +#define RUN(algo, prog, suffix)\ + (args_init(algo " checksum calculator",\ + prog " [options...] [--] [files...]", NULL,\ + NULL, 1, 0, args_standard_abbreviations),\ + run(argc, argv, &spec, suffix)) /** * Print the checksum in binary */ -#define REPRESENTATION_BINARY 0 +#define REPRESENTATION_BINARY 0 /** * Print the checksum in upper case hexadecimal */ -#define REPRESENTATION_UPPER_CASE 1 +#define REPRESENTATION_UPPER_CASE 1 /** * Print the checksum in lower case hexadecimal */ -#define REPRESENTATION_LOWER_CASE 2 - +#define REPRESENTATION_LOWER_CASE 2 /** @@ -70,8 +45,4 @@ * @param suffix Message suffix * @return An appropriate exit value */ -int run(int argc, char* argv[], libkeccak_generalised_spec_t* restrict gspec, const char* restrict suffix); - - -#endif - +int run(int argc, char *argv[], libkeccak_generalised_spec_t *restrict gspec, const char *restrict suffix); diff --git a/src/completion b/src/completion deleted file mode 100644 index 6da52a7..0000000 --- a/src/completion +++ /dev/null @@ -1,40 +0,0 @@ -; sha3sum – SHA-3 (Keccak) checksum calculator -; -; Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) -; -; This program is free software: you can redistribute it and/or modify -; it under the terms of the GNU Affero General Public License as published by -; the Free Software Foundation, either version 3 of the License, or -; (at your option) any later version. -; -; This program is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Affero General Public License for more details. -; -; You should have received a copy of the GNU Affero General Public License -; along with this program. If not, see <http://www.gnu.org/licenses/>. - - -((value command) - - (multiple unargumented - ((options -h --help) (complete --help) (desc 'Display option summary')) - ((options -u --upper --uppercase --upper-case) (complete --upper-case) (desc 'Use upper-case output')) - ((options -l --lower --lowercase --lower-case) (complete --lower-case) (desc 'Use lower-case output')) - ((options -b --binary) (complete --binary) (desc 'Use binary output')) - ((options -x --hex --hex-input) (complete --hex-input) (desc 'Use hexadecimal input')) - ((options -c --check) (complete --check) (desc 'Check checksums')) - ((options -v --verbose) (complete --verbose) (desc 'Be verbose')) - ) - - (multiple argumented - ((options -R --bitrate --rate) (complete --rate) (arg RATE) (files -0) (desc 'Select rate')) - ((options -C --capacity) (complete --capacity) (arg CAPACITY) (files -0) (desc 'Select capacity')) - ((options -N -O --output-size --output) (complete --output-size) (arg SIZE) (files -0) (desc 'Select output size')) - ((options -S -B --state-size --state) (complete --state-size) (arg SIZE) (files -0) (desc 'Select state size')) - ((options -W --word-size --word) (complete --word-size) (arg SIZE) (files -0) (desc 'Select word size')) - ((options -Z --squeezes) (complete --squeezes) (arg COUNT) (files -0) (desc 'Select squeeze count')) - ) -) - diff --git a/src/keccak-224sum.c b/src/keccak-224sum.c index 147ff77..f7d3095 100644 --- a/src/keccak-224sum.c +++ b/src/keccak-224sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 224); - return RUN("Keccak", "keccak-224sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 224); + return RUN("Keccak", "keccak-224sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccak-256sum.c b/src/keccak-256sum.c index ae13efb..f4f78ac 100644 --- a/src/keccak-256sum.c +++ b/src/keccak-256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 256); - return RUN("Keccak", "keccak-256sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 256); + return RUN("Keccak", "keccak-256sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccak-384sum.c b/src/keccak-384sum.c index 16a7e8e..3a6e3a0 100644 --- a/src/keccak-384sum.c +++ b/src/keccak-384sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 384); - return RUN("Keccak", "keccak-384sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 384); + return RUN("Keccak", "keccak-384sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccak-512sum.c b/src/keccak-512sum.c index 1ddd872..6ba1041 100644 --- a/src/keccak-512sum.c +++ b/src/keccak-512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_keccak((libkeccak_spec_t*)&spec, 512); - return RUN("Keccak", "keccak-512sum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_keccak((libkeccak_spec_t *)&spec, 512); + return RUN("Keccak", "keccak-512sum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/keccaksum.c b/src/keccaksum.c index 62c9c6e..8fc10a8 100644 --- a/src/keccaksum.c +++ b/src/keccaksum.c @@ -1,29 +1,10 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - return RUN("Keccak", "keccaksum", LIBKECCAK_KECCAK_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + return RUN("Keccak", "keccaksum", LIBKECCAK_KECCAK_SUFFIX); } - diff --git a/src/rawshake256sum.c b/src/rawshake256sum.c index 7bd0100..6d6e19a 100644 --- a/src/rawshake256sum.c +++ b/src/rawshake256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_rawshake((libkeccak_spec_t*)&spec, 256, 256); - return RUN("RawSHAKE", "rawshake256sum", LIBKECCAK_RAWSHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_rawshake((libkeccak_spec_t *)&spec, 256, 256); + return RUN("RawSHAKE", "rawshake256sum", LIBKECCAK_RAWSHAKE_SUFFIX); } - diff --git a/src/rawshake512sum.c b/src/rawshake512sum.c index cefb71d..be1d8ac 100644 --- a/src/rawshake512sum.c +++ b/src/rawshake512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_rawshake((libkeccak_spec_t*)&spec, 512, 512); - return RUN("RawSHAKE", "rawshake512sum", LIBKECCAK_RAWSHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_rawshake((libkeccak_spec_t *)&spec, 512, 512); + return RUN("RawSHAKE", "rawshake512sum", LIBKECCAK_RAWSHAKE_SUFFIX); } - diff --git a/src/sha3-224sum.c b/src/sha3-224sum.c index 2ce1255..15fac82 100644 --- a/src/sha3-224sum.c +++ b/src/sha3-224sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 224); - return RUN("SHA-3", "sha3-224sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 224); + return RUN("SHA-3", "sha3-224sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/sha3-256sum.c b/src/sha3-256sum.c index ec01211..2273785 100644 --- a/src/sha3-256sum.c +++ b/src/sha3-256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 256); - return RUN("SHA-3", "sha3-256sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 256); + return RUN("SHA-3", "sha3-256sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/sha3-384sum.c b/src/sha3-384sum.c index ecac0ab..2c18df7 100644 --- a/src/sha3-384sum.c +++ b/src/sha3-384sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 384); - return RUN("SHA-3", "sha3-384sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 384); + return RUN("SHA-3", "sha3-384sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/sha3-512sum.c b/src/sha3-512sum.c index c547c6c..a5b40e3 100644 --- a/src/sha3-512sum.c +++ b/src/sha3-512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_sha3((libkeccak_spec_t*)&spec, 512); - return RUN("SHA-3", "sha3-512sum", LIBKECCAK_SHA3_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_sha3((libkeccak_spec_t *)&spec, 512); + return RUN("SHA-3", "sha3-512sum", LIBKECCAK_SHA3_SUFFIX); } - diff --git a/src/shake256sum.c b/src/shake256sum.c index 1645a53..7ab6cc6 100644 --- a/src/shake256sum.c +++ b/src/shake256sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_shake((libkeccak_spec_t*)&spec, 256, 256); - return RUN("SHAKE", "shake256sum", LIBKECCAK_SHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_shake((libkeccak_spec_t *)&spec, 256, 256); + return RUN("SHAKE", "shake256sum", LIBKECCAK_SHAKE_SUFFIX); } - diff --git a/src/shake512sum.c b/src/shake512sum.c index 6cac04b..3e24ddb 100644 --- a/src/shake512sum.c +++ b/src/shake512sum.c @@ -1,30 +1,11 @@ -/** - * sha3sum – SHA-3 (Keccak) checksum calculator - * - * Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +/* See LICENSE file for copyright and license details. */ #include "common.h" - - -int main(int argc, char* argv[]) +int +main(int argc, char *argv[]) { - libkeccak_generalised_spec_t spec; - libkeccak_generalised_spec_initialise(&spec); - libkeccak_spec_shake((libkeccak_spec_t*)&spec, 512, 512); - return RUN("SHAKE", "shake512sum", LIBKECCAK_SHAKE_SUFFIX); + libkeccak_generalised_spec_t spec; + libkeccak_generalised_spec_initialise(&spec); + libkeccak_spec_shake((libkeccak_spec_t *)&spec, 512, 512); + return RUN("SHAKE", "shake512sum", LIBKECCAK_SHAKE_SUFFIX); } - |