X-Git-Url: https://jxself.org/git/?p=skeinsum.git;a=blobdiff_plain;f=skein_cli.c;h=bb8235483aa91b11309102a1b26055d34436ed3e;hp=63166f503ce762bc9edee940bca49d6e02399117;hb=26d0bdbce9858247b4c40cb7c546c8ba08941fd0;hpb=4bab256d6ad7c26e7e6aafd013945b6ad34d8298 diff --git a/skein_cli.c b/skein_cli.c index 63166f5..bb82354 100644 --- a/skein_cli.c +++ b/skein_cli.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 2015 Jason Self +/* Copyright (C) 2014 2015 2019 Jason Self This file is part of skeinsum. @@ -29,7 +29,7 @@ along with skeinsum. If not, see . #include #include #include -#include "SHA3api_ref.h" +#include "skeinapi_ref.h" #define WARN(msg, ...) fprintf(stderr, "skein%dsum: " msg, hashbitlen, ##__VA_ARGS__) @@ -40,12 +40,11 @@ typedef long long unsigned LLU; extern const int hashbitlen; #define skeinVersion "1.3" + const size_t input_minbufsize = 32 * 1024; const size_t input_maxbufsize = 32 * 1024 * 1024; -char invalidOption = 0; - enum { QUIET_OPTION = 11, @@ -167,7 +166,7 @@ int HashFile(const char file_name[], char MsgDigest[], char mode) } unsigned char output[hashbitlen/4]; - Hash(hashbitlen, (unsigned char*) readbuf, total_readed, output); + Hash(hashbitlen, (unsigned char*) readbuf, total_readed * 8, output); free(readbuf); @@ -331,14 +330,16 @@ int VerifyHashesFromFile(FILE *fp, int status, int warn, int quiet) int hashVersion = decomposeHashLine(hash,MsgDigest_tmp,file_tmp); if (hashVersion == -1) { - fprintf(stderr, "skein%d: %s is using newer version of skein%d algorithm\n",hashbitlen,file_tmp,hashbitlen); - fprintf(stderr, "You should update your algorithm\n"); + WARN("%s is using newer version of skein%d algorithm\n" + "You should update your algorithm\n", + file_tmp, hashbitlen); continue; } else if (hashVersion == 0) { - fprintf(stderr, "skein%d: %s is using an older version of skein%d algorithm\n",hashbitlen,file_tmp,hashbitlen); - fprintf(stderr, "You should use the older algorithm\n"); + WARN("%s is using an older version of skein%d algorithm\n" + "You should use the older algorithm\n", + file_tmp, hashbitlen); continue; } else if (!isProper(MsgDigest_tmp)) @@ -365,9 +366,18 @@ int VerifyHashesFromFile(FILE *fp, int status, int warn, int quiet) return (NotProper || NoMatch) ? -1 : 1; } +void PrintStringHash(const char *s) +{ + unsigned char output[hashbitlen/4]; + char digest[hashbitlen/4 + 1]; + Hash(hashbitlen, s, strlen(s) * 8, output); + hash2hexstr(output, digest); + printf("%s -%s\n", digest, s); +} + void print_version(void) { - printf("skein%dsum 1.0\n", hashbitlen); + printf("skein%dsum %s\n", hashbitlen, VERSION); printf("License GPLv3+: GNU GPL version 3 or later\n"); printf("\n"); printf("This is free software: you are free to change and redistribute it.\n"); @@ -377,29 +387,33 @@ void print_version(void) void print_usage(void) { + printf("Usage: skein%dsum [OPTION]... [FILE]...\n",hashbitlen); printf("Print or check skein (%d-bit) checksums.\n",hashbitlen); - printf("With no FILE, or when FILE is -, read standard input.\n"); - printf("\n"); - printf("-b, --binary read in binary mode\n"); - printf("-c, --check read skein sums from the FILEs and check them\n"); - printf("--tag create a BSD-style checksum\n"); - printf("-t, --text read in text mode (default)\n"); - printf("\n"); - printf("The following three options are useful only when verifying checksums:\n"); - printf("--quiet don't print OK for each successfully verified file\n"); - printf("--status don't output anything, status code shows success\n"); - printf("-w, --warn warn about improperly formatted checksum lines\n"); - printf("\n"); - printf("--strict with --check, exit non-zero for any invalid input\n"); - printf("--help display this help and exit\n"); - printf("--version output version information and exit\n"); - printf("\n"); - printf("The sums are computed as described in version 1.3 of the Skein\n"); - printf("specification. When checking, the input should be a former output of\n"); - printf("this program. The default mode is to print a line with checksum, a\n"); - printf("character indicating input mode ('*' for binary, space for text), and\n"); - printf("name for each FILE.\n"); + printf("With no FILE, or when FILE is -, read standard input.\n" + "\n" + "-b, --binary read in binary mode\n" + "-c, --check read skein sums from the FILEs and check them\n" + "--tag create a BSD-style checksum\n" + "-t, --text read in text mode (default)\n" + "-0 hash strings from command line\n" + "\n" + "The following three options are useful only when verifying checksums:\n" + "--quiet don't print OK for each successfully verified file\n" + "--status don't output anything, status code shows success\n" + "-w, --warn warn about improperly formatted checksum lines\n" + "\n" + "--strict with --check, exit non-zero for any invalid input\n" + "-h, --help display this help and exit\n" + "-V, --version output version information and exit\n" + "\n" + "The sums are computed as described in version %s of the Skein\n" + "specification. When checking, the input should be a former output of\n" + "this program. The default mode is to print a line with checksum, a\n" + "character indicating input mode ('*' for binary, space for text), and\n" + "name for each FILE.\n", skeinVersion); + printf("%s home page: %s\n", PACKAGE_NAME, PACKAGE_URL); + printf("Report bugs to: %s\n", PACKAGE_BUGREPORT); exit(1); } @@ -430,6 +444,27 @@ int is_goodfile(const char filename[]) return 1; /* try it as good */ } +int warn_check_opts(int quiet, int warn, int status) +{ + int n = 0; + if(quiet == 1) + n = WARN("the --quiet option is meaningful only when verifying checksums\n"); + if(status ==1) + n = WARN("the --status option is meaningful only when verifying checksums\n"); + if(warn == 1) + n = WARN("the --warn option is meaningful only when verifying checksums\n"); + return n; +} + +int warn_gen_opts(int tag, int binary) +{ + int n = 0; + if (tag == 1) + n = WARN("the --tag option is meaningful only when calculating file checksums\n"); + if (binary >= 0) + n = WARN("the --text and --binary options are meaningful only when calculating file checksums\n"); + return n; +} int main(int argc, char** argv) { @@ -447,10 +482,10 @@ int main(int argc, char** argv) /***************************************************************************************** ************************************* GETTING DATA *********************************** *****************************************************************************************/ - while ((opt = getopt_long (argc, argv, "hVbctw", long_options, NULL)) != -1) + while ((opt = getopt_long (argc, argv, "hVbctw0", long_options, NULL)) != -1) { switch (opt) { - case 0 : hashString = 1; break; + case '0' : hashString = 1; break; case 'b' : binary = 1; break; case 't' : binary = 0; break; case 'c' : check = 1; break; @@ -472,18 +507,25 @@ int main(int argc, char** argv) ************************************* PROCESSING DATA *********************************** *****************************************************************************************/ - if (check < 0) /* READ FILES, GENERATE CHECKSUMS AND PRINT TO STDOUT.. */ + if (hashString > 0) { - if (quiet == 1 || warn == 1 || status == 1) - { - if(quiet == 1) - WARN("the --quiet option is meaningful only when verifying checksums\n"); - if(status ==1) - WARN("the --status option is meaningful only when verifying checksums\n"); - if(warn == 1) - WARN("the --warn option is meaningful only when verifying checksums\n"); + if (warn_check_opts(quiet, warn, status) + warn_gen_opts(tag, binary)) + TRYHELP_GOODBYE(); + + int n = first_file; + if (n >= argc) { + WARN("command line should contain strings for hashing\n"); TRYHELP_GOODBYE(); } + while (n < argc) + PrintStringHash(argv[n++]); + return 0; + } + + if (check < 0) /* READ FILES, GENERATE CHECKSUMS AND PRINT TO STDOUT.. */ + { + if (warn_check_opts(quiet, warn, status)) + TRYHELP_GOODBYE(); char mode = binary > 0 ? 'b' : 't'; @@ -514,14 +556,8 @@ int main(int argc, char** argv) if (check == 1) /* READ LISTFILES, GENERATE HASHES, COMPARE WITH STORED, PRINT RESULT */ { - if (tag == 1 || binary >= 0) - { - if (tag == 1) - WARN("the --tag option is meaningless when verifying checksums\n"); - if (binary >= 0) - WARN("the --text and --binary options are meaningless when verifying checksums\n"); + if (warn_gen_opts(tag, binary)) TRYHELP_GOODBYE(); - } int file_index; for (file_index = first_file; file_index < argc; file_index++)