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

Last changes before 1.0.6a snapshot release

Browse source
This commit is contained in:
Werner Koch 2001-09-07 11:40:19 +00:00
parent 59334400a1
commit 2874670be9
26 changed files with 12199 additions and 9794 deletions
Download patch file Download diff file Expand all files Collapse all files

4
g10/ChangeLog
View file

@ -1,5 +1,9 @@
2001-09-07 Werner Koch <wk@gnupg.org>
* status.c, status.h: Added NO_RECP and ALREADY_SIGNED.
* pkclist.c (build_pk_list): Issue NO_RECP.
* keyedit.c (sign_uids): Added experimental ALREADY_SIGNED
* hkp.c (hkp_import): Use log_error. Bug reported by Neal H
Walfield.

2
g10/getkey.c
View file

@ -2067,7 +2067,7 @@ lookup( GETKEY_CTX ctx, KBNODE *ret_keyblock, int secmode )
found:
if( rc && rc != -1 )
log_error("enum_keyblocks_read failed: %s\n", g10_errstr(rc));
log_error("keydb_search failed: %s\n", g10_errstr(rc));
if( !rc ) {
*ret_keyblock = ctx->keyblock; /* return the keyblock */

5
g10/keyedit.c
View file

@ -290,10 +290,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified, int local )
&& (node->pkt->pkt.signature->sig_class&~3) == 0x10 ) {
if( sk_keyid[0] == node->pkt->pkt.signature->keyid[0]
&& sk_keyid[1] == node->pkt->pkt.signature->keyid[1] ) {
char buf[50];
/* Fixme: see whether there is a revocation in which
* case we should allow to sign it again. */
tty_printf(_("Already signed by key %08lX\n"),
(ulong)sk_keyid[1] );
sprintf (buf, "%08lX%08lX",
(ulong)sk->keyid[0], (ulong)sk->keyid[1] );
write_status_text (STATUS_ALREADY_SIGNED, buf);
uidnode->flag &= ~NODFLG_MARK_A; /* remove mark */
}
}

1
g10/pkclist.c
View file

@ -1047,6 +1047,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
if( !rc && !any_recipients ) {
log_error(_("no valid addressees\n"));
write_status_text (STATUS_NO_RECP, "0");
rc = G10ERR_NO_USER_ID;
}

2
g10/status.c
View file

@ -141,6 +141,8 @@ get_status_string ( int no )
case STATUS_USERID_HINT : s = "USERID_HINT"; break;
case STATUS_UNEXPECTED : s = "UNEXPECTED"; break;
case STATUS_INV_RECP : s = "INV_RECP"; break;
case STATUS_NO_RECP : s = "NO_RECP"; break;
case STATUS_ALREADY_SIGNED : s = "ALREADY_SIGNED"; break;
default: s = "?"; break;
}
return s;

2
g10/status.h
View file

@ -91,6 +91,8 @@
#define STATUS_USERID_HINT 59
#define STATUS_UNEXPECTED 60
#define STATUS_INV_RECP 61
#define STATUS_NO_RECP 62
#define STATUS_ALREADY_SIGNED 63
/*-- status.c --*/