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

* keyedit.c (sign_uids): Add additional prompt to the signature level

Browse Source 
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:
David Shaw 2003-06-19 16:54:51 +00:00
parent e160da451e
commit 67fa8b8f3b
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/ChangeLog
View File

@ -1,3 +1,15 @@
2003-06-19 David Shaw <dshaw@jabberwocky.com>
* 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.
2003-06-18 David Shaw <dshaw@jabberwocky.com> 2003-06-18 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for * keyserver.c (parse_keyserver_uri): Accept "http" as an alias for

3
g10/g10.c
View File

@ -164,6 +164,7 @@ enum cmd_and_opt_values { aNull = 0,
oLoadExtension, oLoadExtension,
oGnuPG, oGnuPG,
oRFC1991, oRFC1991,
oRFC2440,
oOpenPGP, oOpenPGP,
oPGP2, oPGP2,
oPGP6, oPGP6,
@ -442,6 +443,7 @@ static ARGPARSE_OPTS opts[] = {
{ oGnuPG, "no-pgp7", 0, "@"}, { oGnuPG, "no-pgp7", 0, "@"},
{ oGnuPG, "no-pgp8", 0, "@"}, { oGnuPG, "no-pgp8", 0, "@"},
{ oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")}, { 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")}, { 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")}, { oPGP2, "pgp2", 0, N_("set all packet, cipher and digest options to PGP 2.x behavior")},
{ oPGP6, "pgp6", 0, "@"}, { oPGP6, "pgp6", 0, "@"},
@ -1441,6 +1443,7 @@ main( int argc, char **argv )
opt.disable_mdc = 1; opt.disable_mdc = 1;
opt.escape_from = 1; opt.escape_from = 1;
break; break;
case oRFC2440:
case oOpenPGP: case oOpenPGP:
/* TODO: When 2440bis becomes a RFC, these may need /* TODO: When 2440bis becomes a RFC, these may need
changing. */ changing. */

6
g10/keyedit.c
View File

@ -649,7 +649,8 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
while(class==0) while(class==0)
{ {
answer = cpr_get("sign_uid.class",_("Your selection? ")); answer = cpr_get("sign_uid.class",_("Your selection? "
"(enter '?' for more information): "));
if(answer[0]=='\0') if(answer[0]=='\0')
class=0x10+opt.def_cert_check_level; /* Default */ class=0x10+opt.def_cert_check_level; /* Default */
@ -2627,7 +2628,8 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
&& ( mainkey || sub_pk ) ) { && ( mainkey || sub_pk ) ) {
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
&& ( (mainkey && uid && (sig->sig_class&~3) == 0x10) && ( (mainkey && uid
&& uid->created && (sig->sig_class&~3) == 0x10)
|| (!mainkey && sig->sig_class == 0x18) ) ) { || (!mainkey && sig->sig_class == 0x18) ) ) {
/* this is a selfsignature which is to be replaced */ /* this is a selfsignature which is to be replaced */
PKT_signature *newsig; PKT_signature *newsig;