diff --git a/GCryptCLI/include/Version.h b/GCryptCLI/include/Version.h index 7a7217b..cab4045 100644 --- a/GCryptCLI/include/Version.h +++ b/GCryptCLI/include/Version.h @@ -1,7 +1,7 @@ #ifndef GCRYPTCLI_VERSION_H #define GCRYPTCLI_VERSION_H -#define GCRYPTCLI_VERSION 0.12511 +#define GCRYPTCLI_VERSION 0.12512 #endif diff --git a/GCryptCLI/readme.md b/GCryptCLI/readme.md index 2786da8..028ee0a 100644 --- a/GCryptCLI/readme.md +++ b/GCryptCLI/readme.md @@ -41,7 +41,7 @@ THIS IS EXPERIMENTAL SOFTWARE AND MUST BE CONSIDERED INSECURE. DO NOT USE THIS T --progress-interval INT default=['1000'] Print digestion progress reports every these many data blocks. ---puffer-input VOID Will read the entire input before beginning any digestion. +--buffer-input VOID Will read the entire input before beginning any digestion. --progress -p VOID Print digestion progress to stderr. May be advisable for large files, as the cipher is rather slow. @@ -53,7 +53,7 @@ THIS IS EXPERIMENTAL SOFTWARE AND MUST BE CONSIDERED INSECURE. DO NOT USE THIS T --iobase-10 VOID incompatibilities=[--iobase-bytes, --iobase-2, --iobase-8, --iobase-16, --iobase-64, --iobase-uwu, --iobase-ugh] Interpret and format ciphertexts in base10 ---puffer-output VOID Will digest the entire data before initiating any output. +--buffer-output VOID Will digest the entire data before initiating any output. --lib-version VOID Will supply the version of GCryptLib used. @@ -154,10 +154,10 @@ File `decrypted_cat.jpg` will be created. You can now open it again. Its content #### Encrypting large files takes time. How's the progress? ```sh -$ gcrypt -e --keyask --infile "cat.jpg" --puffer-input --progress +$ gcrypt -e --keyask --infile "cat.jpg" --buffer-input --progress ``` Something along the lines of `Encrypting... (Block 200 / 1148 - 17.4216%)` will be regularly, but not too often, printed to stderr. -Obviously, to print progress, we have to know the size of the input. Hence, it has to be puffered. +Obviously, to print progress, we have to know the size of the input. Hence, it has to be buffered. #### Any cipher can also compute hashsums ```sh @@ -186,8 +186,8 @@ $ gcrypt -d --key "123" --infile "music.mp3.crypt" | mpv - By default, gcrypt will read a block, digest it, and output the result immediately. Sometimes you don't want that. Use these flags, respectively: ``` ---puffer-input # Reads all input to memory before beginning to digest it ---puffer-output # Digests all input before beginning to write any +--buffer-input # Reads all input to memory before beginning to digest it +--buffer-output # Digests all input before beginning to write any ``` ## Esoteric data formats diff --git a/GCryptCLI/src/CommandlineInterface.cpp b/GCryptCLI/src/CommandlineInterface.cpp index b6fcec3..ca660e3 100644 --- a/GCryptCLI/src/CommandlineInterface.cpp +++ b/GCryptCLI/src/CommandlineInterface.cpp @@ -102,11 +102,11 @@ void CommandlineInterface::Init(int argc, const char* const* argv) { nupp.RegisterConstraint("--cli-version", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); nupp.RegisterAbbreviation("-v", "--cli-version"); - nupp.RegisterDescription("--puffer-input", "Will read the entire input before beginning any digestion."); - nupp.RegisterConstraint("--puffer-input", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); + nupp.RegisterDescription("--buffer-input", "Will read the entire input before beginning any digestion."); + nupp.RegisterConstraint("--buffer-input", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); - nupp.RegisterDescription("--puffer-output", "Will digest the entire data before initiating any output."); - nupp.RegisterConstraint("--puffer-output", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); + nupp.RegisterDescription("--buffer-output", "Will digest the entire data before initiating any output."); + nupp.RegisterConstraint("--buffer-output", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); nupp.RegisterDescription("--no-newline", "Don't postfix stdout output with a newline"); nupp.RegisterConstraint("--no-newline", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); @@ -173,10 +173,10 @@ void CommandlineInterface::SpecialCompatibilityChecking() { if ( (nupp.HasParam("--progress")) && - (!nupp.HasParam("--puffer-input")) + (!nupp.HasParam("--buffer-input")) ) { - CrashWithMsg("--progress requires --puffer-input to work!"); + CrashWithMsg("--progress requires --buffer-input to work!"); } return; diff --git a/GCryptCLI/src/DataIngestionLayer.cpp b/GCryptCLI/src/DataIngestionLayer.cpp index af6bfa7..7cf81b4 100644 --- a/GCryptCLI/src/DataIngestionLayer.cpp +++ b/GCryptCLI/src/DataIngestionLayer.cpp @@ -323,16 +323,16 @@ bool DataIngestionLayer::ReachedEOF() { } bool DataIngestionLayer::IsBlockReady() { - // We're not ready, if we haven't reached EOF, if we should puffer + // We're not ready, if we haven't reached EOF, if we should buffer // the input. if ( - (CommandlineInterface::Get().HasParam("--puffer-input")) && + (CommandlineInterface::Get().HasParam("--buffer-input")) && (!reachedEof) ) { return false; } - // If we're not puffering, just return whether or not + // If we're not buffering, just return whether or not // we have any blocks... return blocks.size() > 0; } diff --git a/GCryptCLI/src/DataOutputLayer.cpp b/GCryptCLI/src/DataOutputLayer.cpp index 26fd4eb..0b5e494 100644 --- a/GCryptCLI/src/DataOutputLayer.cpp +++ b/GCryptCLI/src/DataOutputLayer.cpp @@ -65,13 +65,13 @@ void DataOutputLayer::WriteBlock() { } // Check if we have any block to write - // and if we should (output-puffering) + // and if we should (output-buffering) // Basically: only output if we have anything to output, and - // if --puffer-output is given, only output once we have reachedEof. + // if --buffer-output is given, only output once we have reachedEof. if ( (blocks.size() > 0) && ( - (!CommandlineInterface::Get().HasParam("--puffer-output")) || + (!CommandlineInterface::Get().HasParam("--buffer-output")) || (reachedEof) ) ) {