Skip to content

Issue 9 hypen for stdout #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clach04 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Issue 9 hypen for stdout #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0303ec8
Fix issue #5 - printf stdint macro
clach04 Jan 25, 2026
f6e4fe7
Ignore Windows EXEs and vim backup files
clach04 Jan 25, 2026
bfc6e19
Cleanup trailing blanks in source
clach04 Jan 25, 2026
ea525fc
Git ignore .bak files
clach04 Jan 25, 2026
e7da203
Implement issue #9 - support hyphen `-` for stdout
clach04 Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
kr
*.bak
*.exe
*.o
*.profraw
*.profdata
*~
tmp
test.out
cov
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AEAD interface of Monocypher to encrypt/decrypt files using
`kr` offers two modes of operation:

- Keyfile-based: a private key is stored on the user's machine and is used to
encrypt and decrypt files.
encrypt and decrypt files.

- Passphrase-based: an encryption/decryption key is generated, on the fly, using
Argon2i (with a random salt).
Expand Down Expand Up @@ -65,7 +65,7 @@ _same_ pair (passphrase, userID) on every invocation. For example:
```
$ kr -guUSERID -p"PASS PHRASE" ~/key.sec
```
Or
Or

```
$ kr -g --uid=USERID --passphrase="PASS PHRASE" ~/key.sec
Expand Down Expand Up @@ -173,7 +173,7 @@ pipes:
```
$ echo 'Hello, world!' | kr -epPASS | kr -dpPASS
```
or with keyfiles
or with keyfiles

```
$ echo 'Hello, world!' | kr -ek ~/.key.sec | kr -dk ~/.key.sec
Expand Down
14 changes: 7 additions & 7 deletions src/kr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static enum error encrypt(FILE *in, FILE *out, const uint8_t key[KEY_SIZE],
uint8_t *ad = (eof) ? END_TAG : NULL; // if last chunk, tag it.
size_t adlen = (eof) ? 4 : 0;

// Arguments order:
// Arguments order:
// ctx, cipher_text, mac, ad, ad_size, plain_text, text_size.
// The mac comes after the encrypted chunk, thus:
// - the mac is located at buf_out + len, and
Expand Down Expand Up @@ -318,7 +318,7 @@ static enum error decrypt(FILE *in, FILE *out, const uint8_t key[KEY_SIZE],
uint8_t *ad = (eof) ? END_TAG : 0; // last chunk should've been tagged.
size_t adlen = (eof) ? 4 : 0;

// Arguments order:
// Arguments order:
// ctx, plain_text, mac, ad, ad_size, cipher_text, text_size.
// The read 'len' bytes from 'in' already includes the mac, thus:
// - the mac is located at buf_in + len - MAC_SIZE, and
Expand All @@ -343,7 +343,7 @@ static enum error decrypt(FILE *in, FILE *out, const uint8_t key[KEY_SIZE],
}

// Generate a key_size bytes key from a passphrase and a salt (random)
// using Argon2i (with configuration in 'config', inputs (password and salt)
// using Argon2i (with configuration in 'config', inputs (password and salt)
// data in 'inputs'), and extras (key and ad). This needs a work area that
// has to be allocated. If this allocation fails, securely wipe inputs and
// extras and exit.
Expand Down Expand Up @@ -448,7 +448,7 @@ static enum error read_keyfile(FILE *kf, uint8_t key[KEY_SIZE])
// Inspect the protection-version byte, and get its MSB.
int protected = *version >> 7;
if (!protected) {
// Key is not protected. Copy the last KEY_SIZE bytes.
// Key is not protected. Copy the last KEY_SIZE bytes.
memcpy(key, fkey, KEY_SIZE);
} else {
// Ask the user to provide a passphrase to decrypt the key.
Expand Down Expand Up @@ -709,7 +709,7 @@ int main(int argc, char *argv[])
// outfile is needed for encryption, decryption, and keygen.
if (mode & (MODE_ENCRYPT | MODE_DECRYPT | MODE_KEYGEN)) {
outfile = optparse_arg(&options);
out = !outfile ? stdout : fopen(outfile, "wb");
out = !outfile || !strcmp(outfile, "-") ? stdout : fopen(outfile, "wb");
if (!out) {
BAIL(ERR_OUTPUT_FILE);
}
Expand All @@ -722,7 +722,7 @@ int main(int argc, char *argv[])
BAIL(ERR_NO_RANDOM);
}
// If the key to be generated depends on a uid and a passphrase,
// generate a deterministic one with the same value when given
// generate a deterministic one with the same value when given
// the same uid and passphrase.
if (use_passphrase) {
// Hash the uid to use it as a salt for key derivation.
Expand Down Expand Up @@ -830,7 +830,7 @@ int main(int argc, char *argv[])
}

// Clean everything and exit.
bail:
bail:
// Safely wipe sensitive info.
crypto_wipe(key, KEY_SIZE);
crypto_wipe(passphrase, MAXPASS);
Expand Down
4 changes: 2 additions & 2 deletions tests/tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static int p_encrypt_decrypt(void)
fsize = 0;
}
if (DEBUG) {
printf(YELLOW "\tFile size:" BLUE " %lu bytes\n", fsize);
printf(YELLOW "\tFile size:" BLUE " %" PRIu64 " bytes\n", fsize);
}
fillrand(data, fsize);
fillrand(key, KEY_SIZE);
Expand Down Expand Up @@ -428,7 +428,7 @@ int p_password_enc_dec(void)
}

if (DEBUG) {
printf(YELLOW "\tFile size:" BLUE " %lu bytes\n", fsize);
printf(YELLOW "\tFile size:" BLUE " %" PRIu64 " bytes\n", fsize);
}

fillrand(data, fsize);
Expand Down