security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-12 21:58:50 +01:00
Code Activity

* g10.c (strusage, main): Show development version warning in --version

Browse Source 
output. (main): Set --bzip2-compress-level to the default value at
startup.  Remove --emulate-checksum-bug noop.
This commit is contained in:
David Shaw 2003-12-04 04:58:12 +00:00
parent ad71703ebc
commit 189dea77ea
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,5 +1,10 @@
2003-12-03 David Shaw <dshaw@jabberwocky.com> 2003-12-03 David Shaw <dshaw@jabberwocky.com>
* g10.c (strusage, main): Show development version warning in
--version output.
(main): Set --bzip2-compress-level to the default value at
startup. Remove --emulate-checksum-bug noop.
* options.h, g10.c (main), main.h, seskey.c (do_encode_md, * options.h, g10.c (main), main.h, seskey.c (do_encode_md,
encode_md_value), sig-check.c (do_check), sign.c (do_sign): Remove encode_md_value), sig-check.c (do_check), sign.c (do_sign): Remove
--emulate-md-encode-bug as it only applied to Elgamal signatures, --emulate-md-encode-bug as it only applied to Elgamal signatures,

30
g10/g10.c
View File

@ -222,7 +222,6 @@ enum cmd_and_opt_values
oAlwaysTrust, oAlwaysTrust,
oTrustModel, oTrustModel,
oForceOwnertrust, oForceOwnertrust,
oEmuChecksumBug,
oRunAsShmCP, oRunAsShmCP,
oSetFilename, oSetFilename,
oForYourEyesOnly, oForYourEyesOnly,
@ -566,7 +565,6 @@ static ARGPARSE_OPTS opts[] = {
{ oAlwaysTrust, "always-trust", 0, "@"}, { oAlwaysTrust, "always-trust", 0, "@"},
{ oTrustModel, "trust-model", 2, "@"}, { oTrustModel, "trust-model", 2, "@"},
{ oForceOwnertrust, "force-ownertrust", 2, "@"}, { oForceOwnertrust, "force-ownertrust", 2, "@"},
{ oEmuChecksumBug, "emulate-checksum-bug", 0, "@"},
{ oRunAsShmCP, "run-as-shm-coprocess", 4, "@" }, { oRunAsShmCP, "run-as-shm-coprocess", 4, "@" },
{ oSetFilename, "set-filename", 2, "@" }, { oSetFilename, "set-filename", 2, "@" },
{ oForYourEyesOnly, "for-your-eyes-only", 0, "@" }, { oForYourEyesOnly, "for-your-eyes-only", 0, "@" },
@ -694,6 +692,19 @@ strusage( int level )
case 19: p = case 19: p =
_("Please report bugs to <gnupg-bugs@gnu.org>.\n"); _("Please report bugs to <gnupg-bugs@gnu.org>.\n");
break; break;
#ifdef IS_DEVELOPMENT_VERSION
case 20:
p="NOTE: THIS IS A DEVELOPMENT VERSION!";
break;
case 21:
p="It is only intended for test purposes and should NOT be";
break;
case 22:
p="used in a production environment or with production keys!";
break;
#endif
case 1: case 1:
case 40: p = case 40: p =
_("Usage: gpg [options] [files] (-h for help)"); _("Usage: gpg [options] [files] (-h for help)");
@ -1198,6 +1209,7 @@ main( int argc, char **argv )
i18n_init(); i18n_init();
opt.command_fd = -1; /* no command fd */ opt.command_fd = -1; /* no command fd */
opt.compress_level = -1; /* defaults to standard compress level */ opt.compress_level = -1; /* defaults to standard compress level */
opt.bz2_compress_level = -1; /* defaults to standard compress level */
/* note: if you change these lines, look at oOpenPGP */ /* note: if you change these lines, look at oOpenPGP */
opt.def_cipher_algo = 0; opt.def_cipher_algo = 0;
opt.def_digest_algo = 0; opt.def_digest_algo = 0;
@ -2071,10 +2083,16 @@ main( int argc, char **argv )
fprintf(stderr, "%s\n", strusage(15) ); fprintf(stderr, "%s\n", strusage(15) );
} }
#ifdef IS_DEVELOPMENT_VERSION #ifdef IS_DEVELOPMENT_VERSION
if( !opt.batch ) { if( !opt.batch )
log_info("NOTE: THIS IS A DEVELOPMENT VERSION!\n"); {
log_info("It is only intended for test purposes and should NOT be\n"); const char *s;
log_info("used in a production environment or with production keys!\n");
if((s=strusage(20)))
log_info("%s\n",s);
if((s=strusage(21)))
log_info("%s\n",s);
if((s=strusage(22)))
log_info("%s\n",s);
} }
#endif #endif