diff -up mcrypt-2.6.7/src/gaaout.c.BAD mcrypt-2.6.7/src/gaaout.c --- mcrypt-2.6.7/src/gaaout.c.BAD 2008-08-25 19:29:42.000000000 -0400 +++ mcrypt-2.6.7/src/gaaout.c 2008-08-25 19:30:21.000000000 -0400 @@ -124,7 +124,7 @@ void gaa_help(void) { printf(_("Mcrypt encrypts and decrypts files with symmetric encryption algorithms.\nUsage: mcrypt [-dFusgbhLvrzp] [-f keyfile] [-k key1 key2 ...] [-m mode] [-o keymode] [-s keysize] [-a algorithm] [-c config_file] [file ...]\n\n")); __gaa_helpsingle('g', "openpgp", "", _("Use the OpenPGP (RFC2440) file format.")); - __gaa_helpsingle(0, "no-openpgp", "", _("Use the native (mcrypt) file format.")); + __gaa_helpsingle(0, "no-openpgp", "", _("Use the native (mcrypt) file format. (DEFAULT)")); __gaa_helpsingle(0, "openpgp-z", _("INTEGER "), _("Sets the compression level for openpgp packets (0 disables).")); __gaa_helpsingle('d', "decrypt", "", _("decrypts.")); __gaa_helpsingle('s', "keysize", _("INTEGER "), _("Set the algorithm's key size (in bytes).")); @@ -1037,7 +1037,7 @@ int gaa(int argc, char **argv, gaainfo * gaaval->config_file=NULL; gaaval->mode=NULL; gaaval->input=NULL; gaaval->ed_specified=0; gaaval->double_check=0; gaaval->noecho=1; gaaval->flush=0; gaaval->keysize=0; gaaval->algorithms_directory=NULL; gaaval->modes_directory=NULL; gaaval->nodelete=0; - gaaval->hash=NULL; gaaval->timer=0; gaaval->openpgp=1; gaaval->openpgp_z = 0; ;}; + gaaval->hash=NULL; gaaval->timer=0; gaaval->openpgp=0; gaaval->openpgp_z = 0; ;}; } inited = 1; diff -up mcrypt-2.6.7/src/mcrypt.gaa.BAD mcrypt-2.6.7/src/mcrypt.gaa --- mcrypt-2.6.7/src/mcrypt.gaa.BAD 2008-08-25 19:30:37.000000000 -0400 +++ mcrypt-2.6.7/src/mcrypt.gaa 2008-08-25 19:31:09.000000000 -0400 @@ -12,7 +12,7 @@ helpnode "Mcrypt encrypts and decrypts f #int openpgp; option (g, openpgp) { $openpgp = 1 } "Use the OpenPGP (RFC2440) file format." -option (no-openpgp) { $openpgp = 0 } "Use the native (mcrypt) file format." +option (no-openpgp) { $openpgp = 0 } "Use the native (mcrypt) file format. (DEFAULT)" #int openpgp_z; option (openpgp-z) INT "INTEGER" { $openpgp_z = $1 } "Sets the compression level for openpgp packets (0 disables)." @@ -119,7 +119,7 @@ init { $force=0; $quiet=1; $real_random_ $config_file=NULL; $mode=NULL; $input=NULL; $ed_specified=0; $double_check=0; $noecho=1; $flush=0; $keysize=0; $algorithms_directory=NULL; $modes_directory=NULL; $nodelete=0; - $hash=NULL; $timer=0; $openpgp=1; $openpgp_z = 0; } + $hash=NULL; $timer=0; $openpgp=0; $openpgp_z = 0; } INCOMP kf INCOMP Vq