Skip to content

Fix for -z option being ignored in openpgp mode and incorrect filenames #1

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
Russtopia wants to merge 1 commit into
base: mcrypt-2.6.8
Choose a base branch
from
Open

Fix for -z option being ignored in openpgp mode and incorrect filenames #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/gaaout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ void gaa_help(void)
__gaa_helpsingle('k', "key", _("KEY1 KEY2...KEYN "), _("Specify the key(s)"));
__gaa_helpsingle(0, "noiv", "", _("Do not use an IV."));
__gaa_helpsingle('b', "bare", "", _("Do not keep algorithm information in the encrypted file."));
__gaa_helpsingle('z', "gzip", "", _("Use gzip to compress files before encryption."));
__gaa_helpsingle('p', "bzip2", "", _("Use bzip2 to compress files before encryption."));
__gaa_helpsingle('z', "gzip", "", _("Use gzip to compress/decompress files before/after encryption/decryption. NOTE: cannot be used if openpgp mode is active."));
__gaa_helpsingle('p', "bzip2", "", _("Use bzip2 to compress/decompress files before/after encryption/decryption. NOTE: cannot be used if openpgp mode is active."));
__gaa_helpsingle(0, "flush", "", _("Immediately flush the output"));
__gaa_helpsingle('l', "doublecheck", "", _("Double check passwords."));
__gaa_helpsingle('u', "unlink", "", _("Unlink the input file after encryption or decryption."));
Expand Down
8 changes: 6 additions & 2 deletions src/mcrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,15 @@ int main(int argc, char **argv)
continue;
}
#ifdef ZIP
if ((openpgp != 0) && ( gzipflag == TRUE || bzipflag == TRUE )) {
err_quit(_("Error: Cannot use -z with openpgp mode (does not call gzip or bzip)\n"));
}

if (stream_flag == FALSE) {
if (gzipflag == TRUE)
strcat(outfile, ".gz");
if (openpgp == 0) strcat(outfile, ".gz");
if (bzipflag == TRUE)
strcat(outfile, ".bz2");
if (openpgp == 0) strcat(outfile, ".bz2");
}
#endif
strcat(outfile, ".nc");
Expand Down