mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* keyedit.c (sign_uids): Add additional prompt to the signature level
question. (menu_expire): When changing expiration dates, don't replace selfsigs on revoked uids since this would effectively unrevoke them. There is also no point in replacing expired selfsigs. This is bug #181. * g10.c (main): Add --rfc2440 alias for --openpgp since in a few months, they won't be the same thing.
This commit is contained in:
parent
e160da451e
commit
67fa8b8f3b
3 changed files with 19 additions and 2 deletions
|
@ -164,6 +164,7 @@ enum cmd_and_opt_values { aNull = 0,
|
|||
oLoadExtension,
|
||||
oGnuPG,
|
||||
oRFC1991,
|
||||
oRFC2440,
|
||||
oOpenPGP,
|
||||
oPGP2,
|
||||
oPGP6,
|
||||
|
@ -442,6 +443,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ oGnuPG, "no-pgp7", 0, "@"},
|
||||
{ oGnuPG, "no-pgp8", 0, "@"},
|
||||
{ oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")},
|
||||
{ oRFC2440, "rfc2440", 0, "@" },
|
||||
{ oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")},
|
||||
{ oPGP2, "pgp2", 0, N_("set all packet, cipher and digest options to PGP 2.x behavior")},
|
||||
{ oPGP6, "pgp6", 0, "@"},
|
||||
|
@ -1441,6 +1443,7 @@ main( int argc, char **argv )
|
|||
opt.disable_mdc = 1;
|
||||
opt.escape_from = 1;
|
||||
break;
|
||||
case oRFC2440:
|
||||
case oOpenPGP:
|
||||
/* TODO: When 2440bis becomes a RFC, these may need
|
||||
changing. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue