Attachment #499848 for bug #635264

Lines 138-145 void gaa_help(void) Link Here

(-)a/src/gaaout.c (-2 / +2 lines)
138	__gaa_helpsingle('k', "key", _("KEY1 KEY2...KEYN "), _("Specify the key(s)"));	138	__gaa_helpsingle('k', "key", _("KEY1 KEY2...KEYN "), _("Specify the key(s)"));
139	__gaa_helpsingle(0, "noiv", "", _("Do not use an IV."));	139	__gaa_helpsingle(0, "noiv", "", _("Do not use an IV."));
140	__gaa_helpsingle('b', "bare", "", _("Do not keep algorithm information in the encrypted file."));	140	__gaa_helpsingle('b', "bare", "", _("Do not keep algorithm information in the encrypted file."));
141	__gaa_helpsingle('z', "gzip", "", _("Use gzip to compress files before encryption."));	141	__gaa_helpsingle('z', "gzip", "", _("Use gzip to compress/decompress files before/after encryption/decryption. NOTE: cannot be used if openpgp mode is active."));
142	__gaa_helpsingle('p', "bzip2", "", _("Use bzip2 to compress files before encryption."));	142	__gaa_helpsingle('p', "bzip2", "", _("Use bzip2 to compress/decompress files before/after encryption/decryption. NOTE: cannot be used if openpgp mode is active."));
143	__gaa_helpsingle(0, "flush", "", _("Immediately flush the output"));	143	__gaa_helpsingle(0, "flush", "", _("Immediately flush the output"));
144	__gaa_helpsingle('l', "doublecheck", "", _("Double check passwords."));	144	__gaa_helpsingle('l', "doublecheck", "", _("Double check passwords."));
145	__gaa_helpsingle('u', "unlink", "", _("Unlink the input file after encryption or decryption."));	145	__gaa_helpsingle('u', "unlink", "", _("Unlink the input file after encryption or decryption."));




	       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)
		  if (openpgp == 0) strcat(outfile, ".gz");
	       if (bzipflag == TRUE)
		  if (openpgp == 0) strcat(outfile, ".bz2");
	    }
#endif
	    strcat(outfile, ".nc");
- 

Return to bug 635264

Lines 552-562 int main(int argc, char **argv) Link Here

(-)a/src/mcrypt.c (-3 / +6 lines)
552	continue;	552	continue;
553	}	553	}
554	#ifdef ZIP	554	#ifdef ZIP
		555	if ((openpgp != 0) && ( gzipflag == TRUE \|\| bzipflag == TRUE )) {
		556	err_quit(_("Error: Cannot use -z with openpgp mode (does not call gzip or bzip)\n"));
		557	}
		558
555	if (stream_flag == FALSE) {	559	if (stream_flag == FALSE) {
556	if (gzipflag == TRUE)	560	if (gzipflag == TRUE)
557	strcat(outfile, ".gz");	561	if (openpgp == 0) strcat(outfile, ".gz");
558	if (bzipflag == TRUE)	562	if (bzipflag == TRUE)
559	strcat(outfile, ".bz2");	563	if (openpgp == 0) strcat(outfile, ".bz2");
560	}	564	}
561	#endif	565	#endif
562	strcat(outfile, ".nc");	566	strcat(outfile, ".nc");
563	-