mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
* keyedit.c (sign_uids): Do not sign expired uids without --expert (same
behavior as revoked uids). * mainproc.c (print_notation_data, check_sig_and_print): Only show the "key available from" preferred keyserver line if the key is not currently present.
This commit is contained in:
parent
6a00a17bd1
commit
75b4e369eb
@ -1,3 +1,12 @@
|
||||
2003-06-07 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyedit.c (sign_uids): Do not sign expired uids without --expert
|
||||
(same behavior as revoked uids).
|
||||
|
||||
* mainproc.c (print_notation_data, check_sig_and_print): Only show
|
||||
the "key available from" preferred keyserver line if the key is
|
||||
not currently present.
|
||||
|
||||
2003-06-07 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* g10.c (add_notation_data): Make sure that only ascii is passed
|
||||
|
@ -377,6 +377,26 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
|
||||
tty_printf(_(" Unable to sign.\n"));
|
||||
}
|
||||
}
|
||||
else if(uidnode->pkt->pkt.user_id->is_expired)
|
||||
{
|
||||
tty_printf(_("User ID \"%s\" is expired."),user);
|
||||
|
||||
if(opt.expert)
|
||||
{
|
||||
tty_printf("\n");
|
||||
/* No, so remove the mark and continue */
|
||||
if(!cpr_get_answer_is_yes("sign_uid.expire_okay",
|
||||
_("Are you sure you "
|
||||
"still want to sign "
|
||||
"it? (y/N) ")))
|
||||
uidnode->flag &= ~NODFLG_MARK_A;
|
||||
}
|
||||
else
|
||||
{
|
||||
uidnode->flag &= ~NODFLG_MARK_A;
|
||||
tty_printf(_(" Unable to sign.\n"));
|
||||
}
|
||||
}
|
||||
else if(!uidnode->pkt->pkt.user_id->created)
|
||||
{
|
||||
tty_printf(_("WARNING: user ID \"%s\" is not "
|
||||
|
@ -796,15 +796,6 @@ print_notation_data( PKT_signature *sig )
|
||||
write_status_buffer ( STATUS_POLICY_URL, p, n, 0 );
|
||||
}
|
||||
|
||||
seq=0;
|
||||
|
||||
while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL))) {
|
||||
log_info(_("Preferred keyserver: ") );
|
||||
print_string( log_stream(), p, n, 0 );
|
||||
putc( '\n', log_stream() );
|
||||
/* TODO: put in a status-fd tag for preferred keyservers */
|
||||
}
|
||||
|
||||
/* Now check whether the key of this signature has some
|
||||
* notation data */
|
||||
|
||||
@ -1323,6 +1314,23 @@ check_sig_and_print( CTX c, KBNODE node )
|
||||
if( keyserver_import_keyid ( sig->keyid )==0 )
|
||||
rc = do_check_sig(c, node, NULL, &is_expkey );
|
||||
}
|
||||
|
||||
/* If the key still isn't found, try to inform the user where it
|
||||
can be found. */
|
||||
if(rc==G10ERR_NO_PUBKEY)
|
||||
{
|
||||
const byte *p;
|
||||
int seq=0;
|
||||
size_t n;
|
||||
|
||||
while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL)))
|
||||
{
|
||||
log_info(_("Key available from: ") );
|
||||
print_string( log_stream(), p, n, 0 );
|
||||
putc( '\n', log_stream() );
|
||||
}
|
||||
}
|
||||
|
||||
if( !rc || rc == G10ERR_BAD_SIGN ) {
|
||||
KBNODE un, keyblock;
|
||||
int count=0, statno;
|
||||
|
Loading…
x
Reference in New Issue
Block a user