security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-07-26 07:44:46 +00:00
parent a06bc6ffd8
commit 4dbfb24dbb
27 changed files with 303 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

23
g10/g10.c
View file

@ -175,6 +175,8 @@ enum cmd_and_opt_values { aNull = 0,
oDisableCipherAlgo,
oDisablePubkeyAlgo,
oAllowNonSelfsignedUID,
oNoLiteral,
oSetFilesize,
aTest };
@ -334,6 +336,8 @@ static ARGPARSE_OPTS opts[] = {
{ oDisableCipherAlgo, "disable-cipher-algo", 2, "@" },
{ oDisablePubkeyAlgo, "disable-pubkey-algo", 2, "@" },
{ oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
{ oNoLiteral, "no-literal", 0, "@" },
{ oSetFilesize, "set-filesize", 20, "@" },
{0} };
@ -848,6 +852,12 @@ main( int argc, char **argv )
case oAllowNonSelfsignedUID:
opt.allow_non_selfsigned_uid = 1;
break;
case oNoLiteral:
opt.no_literal = 1;
break;
case oSetFilesize:
opt.set_filesize = pargs.r.ret_ulong;
break;
default : pargs.err = configfp? 1:2; break;
}
@ -878,6 +888,17 @@ main( int argc, char **argv )
" the OpenPGP WG has not yet aggreed on MDCs\n");
opt.force_mdc = 0;
}
if (opt.no_literal) {
log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
if (opt.textmode)
log_error(_("%s not allowed with %s!\n"),
"--textmode", "--no-literal" );
if (opt.set_filename)
log_error(_("%s makes no sense with %s!\n"),
"--set-filename", "--no-literal" );
}
if (opt.set_filesize)
log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
if( opt.batch )
tty_batchmode( 1 );
@ -1158,7 +1179,7 @@ main( int argc, char **argv )
}
}
else
wrong_args(_("-k[v][v][v][c] [userid] [keyring]") );
wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") );
break;
case aKeygen: /* generate a key (interactive) */