diff --git a/ChangeLog b/ChangeLog index 405c07b..db06365 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +NEXT + Changed -C again: doesnt support a key argument + anymore, instead I use the facilities I already + have in place (-x and -X). Also, I don't generate + an extra hash for the key anymore. + 0.3.0 Changed publuc key signature storage, previously I didn't add the actual signature, therefore a diff --git a/INSTALL b/INSTALL index 6e90e07..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff --git a/bindings/py/pypcp/raw.py b/bindings/py/pypcp/raw.py index 1bb3234..9e642bb 100644 --- a/bindings/py/pypcp/raw.py +++ b/bindings/py/pypcp/raw.py @@ -867,43 +867,7 @@ uint8_t *zmq_z85_decode (uint8_t *dest, char *string); char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);''' # ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_FORMAT_PBP = 2 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ASYM_CIPHER = 5 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_CIPHER = 0x23 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_PK_HEADER = "----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_HASH_CIPHER = 0x22 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_HASH_NAME = "BLAKE2" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_CRYPTO_ADD = (32 - 16) - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ASYM_CIPHER_SIG = 24 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_SUB_KEYFLAGS = 27 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_SUB_NOTATION = 20 +PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----" # ./gencffi.pl: from ../../include/pcp/defines.h:172 @@ -911,37 +875,133 @@ PCP_VAULT_ID = 14 # ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SK_HEADER = "----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----" +EXP_FORMAT_PBP = 2 # ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ENFILE_HEADER = "----- BEGIN PCP ENCRYPTED FILE -----\r\n" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_SIGPREFIX = "\nnacl-" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ZFILE_FOOTER = "----- END Z85 ENCODED FILE -----" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----" +EXP_SIG_SUB_KEYFLAGS = 27 # ./gencffi.pl: from ../../include/pcp/defines.h:172 PCP_SIG_END = "----- END ED25519 SIGNATURE -----" +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_CIPHER_NAME = "ED25519" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_PK_HEADER = "----- BEGIN ED25519-CURVE29915 PUBLIC KEY -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SK_FOOTER = "----- END ED25519-CURVE29915 PRIVATE KEY -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_SUB_CTIME = 2 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_SIG_HEADER = "----- BEGIN ED25519 SIGNED MESSAGE -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_SUB_KEYEXPIRE = 9 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PBP_COMPAT_SALT = "qa~t](84z<1t<1oz:ik.@IRNyhG=8q(on9}4#!/_h#a7wqK{Nt$T?W>,mt8NqYq&6U,rSYI2GRDd:Bcm" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_ASYM_CIPHER_ANON = 6 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_TYPE = 0x1F + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_SUB_NOTATION = 20 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_SYM_CIPHER = 23 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_CRYPTO_ADD = (32 - 16) + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_SIGPREFIX = "\nnacl-" + + # ./gencffi.pl: from ../../include/pcp/defines.h:172 PCP_RFC_CIPHER = 0x21 +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_HASH_NAME = "BLAKE2" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_HASH_CIPHER = 0x22 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_ASYM_CIPHER_SIG = 24 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_CIPHER = 0x23 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_ENFILE_HEADER = "----- BEGIN PCP ENCRYPTED FILE -----\r\n" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_ASYM_CIPHER = 5 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_SIG_START = "----- BEGIN ED25519 SIGNATURE -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +PCP_BLOCK_SIZE = 32 * 1024 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SIG_SUB_SIGEXPIRE = 3 + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_PK_FOOTER = "----- END ED25519-CURVE29915 PUBLIC KEY -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_SK_HEADER = "----- BEGIN ED25519-CURVE29915 PRIVATE KEY -----" + + +# ./gencffi.pl: from ../../include/pcp/defines.h:172 +EXP_FORMAT_NATIVE = 1 + + # ./gencffi.pl: from ../../include/pcp/defines.h:172 PCP_ENCRYPT_MAC = 56 @@ -950,65 +1010,5 @@ PCP_ENCRYPT_MAC = 56 PCP_ME = "Pretty Curved Privacy" -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ASYM_CIPHER_ANON = 6 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ENFILE_FOOTER = "\r\n----- END PCP ENCRYPTED FILE -----\r\n" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_SUB_CTIME = 2 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_SIG_START = "----- BEGIN ED25519 SIGNATURE -----" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_ZFILE_HEADER = "----- BEGIN Z85 ENCODED FILE -----" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_SUB_SIGEXPIRE = 3 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_CIPHER_NAME = "ED25519" - - # ./gencffi.pl: from ../../include/pcp/defines.h:172 EXP_PK_CIPHER = 0x21 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_PK_FOOTER = "----- END ED25519-CURVE29915 PUBLIC KEY -----" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_SUB_KEYEXPIRE = 9 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_FORMAT_NATIVE = 1 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_SYM_CIPHER = 23 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_PK_CIPHER_NAME = "CURVE25519-ED25519-POLY1305-SALSA20" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PBP_COMPAT_SALT = "qa~t](84z<1t<1oz:ik.@IRNyhG=8q(on9}4#!/_h#a7wqK{Nt$T?W>,mt8NqYq&6U,rSYI2GRDd:Bcm" - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -PCP_BLOCK_SIZE = 32 * 1024 - - -# ./gencffi.pl: from ../../include/pcp/defines.h:172 -EXP_SIG_TYPE = 0x1F diff --git a/include/pcp/config.h.in b/include/pcp/config.h.in index 7f7bd36..b53de92 100644 --- a/include/pcp/config.h.in +++ b/include/pcp/config.h.in @@ -160,9 +160,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff --git a/man/options.pod b/man/options.pod index 87f0135..22efe89 100644 --- a/man/options.pod +++ b/man/options.pod @@ -9,6 +9,8 @@ will be used. -I --infile Input file. If not specified, stdin will be used. + -x --xpass Provide password. B! Use for + testing or debugging only! -X --password-file Read passphrase from . If is -, read from stdin. This takes precedence over other uses of stdin @@ -26,7 +28,7 @@ --version Print program version. -D --debug Enable debug output. -v --verbose Enable verbose output. - + Keymanagement Options: -k --keygen Generate a CURVE25519 secret key. If the generated key is the first one in @@ -132,11 +134,9 @@ uses stdin/stdout Misc Options: - -C --checksum [] Calculate a Blake2b checksum of one or more files. - If is provided, an authenticated hash will - be calculated, otherwise a normal hash. If you don't - want to generate an authenticated hash, specify - -- after -C. + -C --checksum Calculate a Blake2b checksum of one or more files. + If -x is provided, an authenticated hash will + be calculated, otherwise a normal hash. Use -I to specify one file or put multiple file names after -C like "pcp1 -C -- file1 file2 file3". diff --git a/man/pcp1.1 b/man/pcp1.1 index 9b7c71d..c16bae7 100644 --- a/man/pcp1.1 +++ b/man/pcp1.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "PCP1 1" -.TH PCP1 1 "2015-07-21" "PCP 0.3.0" "USER CONTRIBUTED DOCUMENTATION" +.TH PCP1 1 "2015-07-22" "PCP 0.3.0" "USER CONTRIBUTED DOCUMENTATION" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -158,6 +158,8 @@ Pretty Curved Privacy \- File encryption using eliptic curve cryptography. \& \-V \-\-vault Specify an alternate vault file. \& \-O \-\-outfile Output file. STDOUT if unspecified. \& \-I \-\-infile Input file. STDIN if unspecified. +\& \-x \-\-xpass Provide password. INSECURE! Use for testing +\& or debugging only! \& \-X \-\-password\-file Read passphrase from . \& \-i \-\-keyid Specify a key id for various operations. \& \-r \-\-recipient Specify a recpipient, multiple allowed. @@ -193,7 +195,8 @@ Pretty Curved Privacy \- File encryption using eliptic curve cryptography. \& \-a \-\-armor \-\-textmode same as \-z \& \& Misc Options: -\& \-C \-\-checksum [] calculate a Blake2 checksum of one or more files. +\& \-C \-\-checksum calculate a Blake2 checksum of one or more files. +\& add \-x to compute an authenticated hash. \& \& Arguments: \& Extra arguments after options are treated as filenames or @@ -209,6 +212,8 @@ Pretty Curved Privacy \- File encryption using eliptic curve cryptography. \& will be used. \& \-I \-\-infile Input file. If not specified, stdin \& will be used. +\& \-x \-\-xpass Provide password. B! Use for +\& testing or debugging only! \& \-X \-\-password\-file Read passphrase from . If \& is \-, read from stdin. This takes \& precedence over other uses of stdin @@ -226,7 +231,7 @@ Pretty Curved Privacy \- File encryption using eliptic curve cryptography. \& \-\-version Print program version. \& \-D \-\-debug Enable debug output. \& \-v \-\-verbose Enable verbose output. -\& +\& \& Keymanagement Options: \& \-k \-\-keygen Generate a CURVE25519 secret key. If \& the generated key is the first one in @@ -332,11 +337,9 @@ Pretty Curved Privacy \- File encryption using eliptic curve cryptography. \& uses stdin/stdout \& \& Misc Options: -\& \-C \-\-checksum [] Calculate a Blake2b checksum of one or more files. -\& If is provided, an authenticated hash will -\& be calculated, otherwise a normal hash. If you don\*(Aqt -\& want to generate an authenticated hash, specify -\& \-\- after \-C. +\& \-C \-\-checksum Calculate a Blake2b checksum of one or more files. +\& If \-x is provided, an authenticated hash will +\& be calculated, otherwise a normal hash. \& Use \-I to specify one file or put multiple file \& names after \-C like "pcp1 \-C \-\- file1 file2 file3". .Ve diff --git a/man/pcp1.html b/man/pcp1.html index 534b192..4b5effb 100644 --- a/man/pcp1.html +++ b/man/pcp1.html @@ -86,6 +86,8 @@ -V --vault <vaultfile> Specify an alternate vault file. -O --outfile <file> Output file. STDOUT if unspecified. -I --infile <file> Input file. STDIN if unspecified. + -x --xpass <passwd> Provide password. INSECURE! Use for testing + or debugging only! -X --password-file <file> Read passphrase from <file>. -i --keyid <id> Specify a key id for various operations. -r --recipient <string> Specify a recpipient, multiple allowed. @@ -121,7 +123,8 @@ -a --armor --textmode same as -z Misc Options: - -C --checksum [<key>] calculate a Blake2 checksum of one or more files. + -C --checksum calculate a Blake2 checksum of one or more files. + add -x <key> to compute an authenticated hash. Arguments: Extra arguments after options are treated as filenames or @@ -137,6 +140,8 @@ will be used. -I --infile <file> Input file. If not specified, stdin will be used. + -x --xpass <passwd> Provide password. B<INSECURE>! Use for + testing or debugging only! -X --password-file <file> Read passphrase from <file>. If <file> is -, read from stdin. This takes precedence over other uses of stdin @@ -154,7 +159,7 @@ --version Print program version. -D --debug Enable debug output. -v --verbose Enable verbose output. - + Keymanagement Options: -k --keygen Generate a CURVE25519 secret key. If the generated key is the first one in @@ -260,11 +265,9 @@ uses stdin/stdout Misc Options: - -C --checksum [<key>] Calculate a Blake2b checksum of one or more files. - If <key> is provided, an authenticated hash will - be calculated, otherwise a normal hash. If you don't - want to generate an authenticated hash, specify - -- after -C. + -C --checksum Calculate a Blake2b checksum of one or more files. + If -x is provided, an authenticated hash will + be calculated, otherwise a normal hash. Use -I to specify one file or put multiple file names after -C like "pcp1 -C -- file1 file2 file3". diff --git a/man/pcp1.pod b/man/pcp1.pod index 45a64ba..1e5c28e 100644 --- a/man/pcp1.pod +++ b/man/pcp1.pod @@ -21,6 +21,8 @@ Pretty Curved Privacy - File encryption using eliptic curve cryptography. -V --vault Specify an alternate vault file. -O --outfile Output file. STDOUT if unspecified. -I --infile Input file. STDIN if unspecified. + -x --xpass Provide password. INSECURE! Use for testing + or debugging only! -X --password-file Read passphrase from . -i --keyid Specify a key id for various operations. -r --recipient Specify a recpipient, multiple allowed. @@ -56,7 +58,8 @@ Pretty Curved Privacy - File encryption using eliptic curve cryptography. -a --armor --textmode same as -z Misc Options: - -C --checksum [] calculate a Blake2 checksum of one or more files. + -C --checksum calculate a Blake2 checksum of one or more files. + add -x to compute an authenticated hash. Arguments: Extra arguments after options are treated as filenames or @@ -72,6 +75,8 @@ Pretty Curved Privacy - File encryption using eliptic curve cryptography. will be used. -I --infile Input file. If not specified, stdin will be used. + -x --xpass Provide password. B! Use for + testing or debugging only! -X --password-file Read passphrase from . If is -, read from stdin. This takes precedence over other uses of stdin @@ -89,7 +94,7 @@ Pretty Curved Privacy - File encryption using eliptic curve cryptography. --version Print program version. -D --debug Enable debug output. -v --verbose Enable verbose output. - + Keymanagement Options: -k --keygen Generate a CURVE25519 secret key. If the generated key is the first one in @@ -195,11 +200,9 @@ Pretty Curved Privacy - File encryption using eliptic curve cryptography. uses stdin/stdout Misc Options: - -C --checksum [] Calculate a Blake2b checksum of one or more files. - If is provided, an authenticated hash will - be calculated, otherwise a normal hash. If you don't - want to generate an authenticated hash, specify - -- after -C. + -C --checksum Calculate a Blake2b checksum of one or more files. + If -x is provided, an authenticated hash will + be calculated, otherwise a normal hash. Use -I to specify one file or put multiple file names after -C like "pcp1 -C -- file1 file2 file3". diff --git a/src/encryption.c b/src/encryption.c index 2cd530f..2b7b4c3 100644 --- a/src/encryption.c +++ b/src/encryption.c @@ -363,16 +363,10 @@ int pcpencrypt(char *id, char *infile, char *outfile, char *passwd, plist_t *rec void pcpchecksum(char **files, int filenum, char *key) { int i; byte *checksum = ucmalloc(crypto_generichash_BYTES_MAX); - byte *keyhash = NULL; - size_t hashlen = 0; + size_t keylen = 0; - if(key != NULL) { - keyhash = ucmalloc(crypto_generichash_BYTES); - crypto_generichash(keyhash, crypto_generichash_BYTES, - (byte *)key, strlen(key), - NULL, crypto_generichash_BYTES); - hashlen = crypto_generichash_BYTES; - } + if(key != NULL) + keylen = strlen(key); for(i=0; i 0) { + if(pcp_checksum(ptx, pin, checksum, (byte *)key, keylen) > 0) { char *hex = _bin2hex(checksum, crypto_generichash_BYTES_MAX); fprintf(stdout, "BLAKE2b (%s) = %s\n", files[i], hex); free(hex); @@ -397,7 +391,4 @@ void pcpchecksum(char **files, int filenum, char *key) { } free(checksum); - - if(keyhash != NULL) - free(keyhash); } diff --git a/src/pcp.c b/src/pcp.c index edac273..f048498 100644 --- a/src/pcp.c +++ b/src/pcp.c @@ -114,7 +114,7 @@ int main (int argc, char **argv) { { "decrypt", no_argument, NULL, 'd' }, { "anonymous", no_argument, NULL, 'A' }, { "add-myself", no_argument, NULL, 'M' }, - { "checksum", optional_argument, NULL, 'C' }, + { "checksum", no_argument, NULL, 'C' }, /* encoding */ { "z85-encode", no_argument, NULL, 'z' }, @@ -136,7 +136,7 @@ int main (int argc, char **argv) { { NULL, 0, NULL, 0 } }; - while ((opt = getopt_long(argc, argv, "klLV:vdehsO:i:I:pSPRtEx:DzaZr:gcmf:b1F:0KAMX:jC:", + while ((opt = getopt_long(argc, argv, "klLV:vdehsO:i:I:pSPRtEx:DzaZr:gcmf:b1F:0KAMX:jC", longopts, NULL)) != -1) { switch (opt) { @@ -233,10 +233,6 @@ int main (int argc, char **argv) { break; case 'C': mode += PCP_MODE_CHECKSUM; - if(strlen(optarg) > 0 && strncmp(optarg, "--", 3) > 0) { - xpass = smalloc(strlen(optarg)+1); - strncpy(xpass, optarg, strlen(optarg)+1); - } break; case 'f': sigfile = ucmalloc(strlen(optarg)+1); diff --git a/src/usage.h b/src/usage.h index 0e6e875..c305c20 100644 --- a/src/usage.h +++ b/src/usage.h @@ -16,6 +16,8 @@ "-V --vault Specify an alternate vault file.\n" \ "-O --outfile Output file. STDOUT if unspecified.\n" \ "-I --infile Input file. STDIN if unspecified.\n" \ +"-x --xpass Provide password. INSECURE! Use for testing\n" \ +" or debugging only!\n" \ "-X --password-file Read passphrase from .\n" \ "-i --keyid Specify a key id for various operations.\n" \ "-r --recipient Specify a recpipient, multiple allowed.\n" \ @@ -51,7 +53,8 @@ "-a --armor --textmode same as -z\n" \ "\n" \ "Misc Options:\n" \ -"-C --checksum [] calculate a Blake2 checksum of one or more files.\n" \ +"-C --checksum calculate a Blake2 checksum of one or more files.\n" \ +" add -x to compute an authenticated hash.\n" \ "\n" \ "Arguments:\n" \ "Extra arguments after options are treated as filenames or\n" \ diff --git a/src/usage.txt b/src/usage.txt index 8ab8ed4..f605590 100644 --- a/src/usage.txt +++ b/src/usage.txt @@ -14,6 +14,8 @@ General Options: -V --vault Specify an alternate vault file. -O --outfile Output file. STDOUT if unspecified. -I --infile Input file. STDIN if unspecified. +-x --xpass Provide password. INSECURE! Use for testing + or debugging only! -X --password-file Read passphrase from . -i --keyid Specify a key id for various operations. -r --recipient Specify a recpipient, multiple allowed. @@ -49,7 +51,8 @@ Encoding Options: -a --armor --textmode same as -z Misc Options: --C --checksum [] calculate a Blake2 checksum of one or more files. +-C --checksum calculate a Blake2 checksum of one or more files. + add -x to compute an authenticated hash. Arguments: Extra arguments after options are treated as filenames or diff --git a/tests/unittests.cfg b/tests/unittests.cfg index a44539e..a97a640 100644 --- a/tests/unittests.cfg +++ b/tests/unittests.cfg @@ -574,22 +574,22 @@ temporarily disabled # checksum tests blake2 = 5baec1cad5bf54287028749d83f2bf3e3ed09f0ee38a233f35dbda1361c6a67fd824e17c86ee3a85181038eb44836c17c42e6beff17fdf997075417914056992 - blake2auth = 6d74340db1e77021861443d6cc0d1acedefed8c6d863789778ed800b99d32b6c96b782d087209ea180e983af51bd649064eff58ef0826c8996ae8017c35082b3 + blake2auth = d7fff04bd63004f7a2ba914d9b2ccff22827230d3c546d97ebaa29cbe9fb2380b7948bc799486d512b4355c24f0cce423e746419098d4455af91898c4a06a5df key = 9U3Dk2s - cmd = $pcp -C -- ../COPYING + cmd = $pcp -C ../COPYING expect = /$blake2/ - cmd = $pcp -C $key ../COPYING + cmd = $pcp -x $key -C ../COPYING expect = /$blake2auth/ - cmd = $pcp -C -- < ../COPYING + cmd = $pcp -C < ../COPYING expect = /$blake2/ - cmd = $pcp -C -- ../COPYING ../README + cmd = $pcp -C ../COPYING ../README expect = /README/