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

"eyesonly" patch. Implements the for-your-eyes-only feature.

Browse Source
This commit is contained in:
David Shaw 2001-12-07 00:54:18 +00:00
parent 46efe28815
commit 88fbd0dfcf
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2001-12-02 David Shaw <dshaw@jabberwocky.com>
* g10.c: Add advisory --for-your-eyes-only option as per section
5.9 of 2440.
2001-12-05 David Shaw <dshaw@jabberwocky.com> 2001-12-05 David Shaw <dshaw@jabberwocky.com>
* Force a V4 sig if the user has a notation or policy URL set. * Force a V4 sig if the user has a notation or policy URL set.

18
g10/g10.c
View File

@ -178,6 +178,8 @@ enum cmd_and_opt_values { aNull = 0,
oEmuChecksumBug, oEmuChecksumBug,
oRunAsShmCP, oRunAsShmCP,
oSetFilename, oSetFilename,
oForYourEyesOnly,
oNoForYourEyesOnly,
oSetPolicyURL, oSetPolicyURL,
oShowPolicyURL, oShowPolicyURL,
oNoShowPolicyURL, oNoShowPolicyURL,
@ -419,6 +421,8 @@ static ARGPARSE_OPTS opts[] = {
{ oEmuChecksumBug, "emulate-checksum-bug", 0, "@"}, { 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, "@" },
{ oNoForYourEyesOnly, "no-for-your-eyes-only", 0, "@" },
{ oSetPolicyURL, "set-policy-url", 2, "@" }, { oSetPolicyURL, "set-policy-url", 2, "@" },
{ oShowPolicyURL, "show-policy-url", 0, "@" }, { oShowPolicyURL, "show-policy-url", 0, "@" },
{ oNoShowPolicyURL, "no-show-policy-url", 0, "@" }, { oNoShowPolicyURL, "no-show-policy-url", 0, "@" },
@ -691,6 +695,7 @@ main( int argc, char **argv )
char *s2k_cipher_string = NULL; char *s2k_cipher_string = NULL;
char *s2k_digest_string = NULL; char *s2k_digest_string = NULL;
char *preference_list = NULL; char *preference_list = NULL;
int eyes_only=0;
int pwfd = -1; int pwfd = -1;
int with_fpr = 0; /* make an option out of --fingerprint */ int with_fpr = 0; /* make an option out of --fingerprint */
int any_explicit_recipient = 0; int any_explicit_recipient = 0;
@ -1020,6 +1025,8 @@ main( int argc, char **argv )
#endif /* __riscos__ */ #endif /* __riscos__ */
break; break;
case oSetFilename: opt.set_filename = pargs.r.ret_str; break; case oSetFilename: opt.set_filename = pargs.r.ret_str; break;
case oForYourEyesOnly: eyes_only = 1; break;
case oNoForYourEyesOnly: eyes_only = 0; break;
case oSetPolicyURL: opt.set_policy_url = pargs.r.ret_str; break; case oSetPolicyURL: opt.set_policy_url = pargs.r.ret_str; break;
case oShowPolicyURL: opt.show_policy_url=1; break; case oShowPolicyURL: opt.show_policy_url=1; break;
case oNoShowPolicyURL: opt.show_policy_url=0; break; case oNoShowPolicyURL: opt.show_policy_url=0; break;
@ -1171,6 +1178,13 @@ main( int argc, char **argv )
if( may_coredump && !opt.quiet ) if( may_coredump && !opt.quiet )
log_info(_("WARNING: program may create a core file!\n")); log_info(_("WARNING: program may create a core file!\n"));
if (eyes_only) {
if (opt.set_filename)
log_info(_("WARNING: %s overrides %s\n"),
"--for-your-eyes-only","--set-filename");
opt.set_filename="_CONSOLE";
}
if (opt.no_literal) { if (opt.no_literal) {
log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal"); log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
@ -1179,8 +1193,10 @@ main( int argc, char **argv )
"--textmode", "--no-literal" ); "--textmode", "--no-literal" );
if (opt.set_filename) if (opt.set_filename)
log_error(_("%s makes no sense with %s!\n"), log_error(_("%s makes no sense with %s!\n"),
"--set-filename", "--no-literal" ); eyes_only?"--for-your-eyes-only":"--set-filename",
"--no-literal" );
} }
if (opt.set_filesize) if (opt.set_filesize)
log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize"); log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
if( opt.batch ) if( opt.batch )