security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-11 21:48:50 +01:00
Code Activity

* keyserver.c (keyserver_export): Disallow user strings that aren't key

Browse Source 
IDs. (keyserver_import): Clarify error message. (keyserver_spawn):
Properly handle 8 bit characters in user IDs in the info lines during
SEND.
This commit is contained in:
David Shaw 2004-02-20 20:18:49 +00:00
parent 9fe66c89d8
commit 34ccced8dc
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,5 +1,11 @@
2004-02-20 David Shaw <dshaw@jabberwocky.com> 2004-02-20 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_export): Disallow user strings that
aren't key IDs.
(keyserver_import): Clarify error message.
(keyserver_spawn): Properly handle 8 bit characters in user IDs in
the info lines during SEND.
* mkdtemp.c: Removed. * mkdtemp.c: Removed.
* Makefile.am: We get mkdtemp.c from libutil.a now, so don't link * Makefile.am: We get mkdtemp.c from libutil.a now, so don't link

42
g10/keyserver.c
View File

@ -899,7 +899,8 @@ keyserver_spawn(int action,STRLIST list,
{ {
if(uid->name[r]==':' || uid->name[r]=='%' if(uid->name[r]==':' || uid->name[r]=='%'
|| uid->name[r]&0x80) || uid->name[r]&0x80)
fprintf(spawn->tochild,"%%%02X",uid->name[r]); fprintf(spawn->tochild,"%%%02X",
(byte)uid->name[r]);
else else
fprintf(spawn->tochild,"%c",uid->name[r]); fprintf(spawn->tochild,"%c",uid->name[r]);
} }
@ -1142,18 +1143,33 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,int count)
int int
keyserver_export(STRLIST users) keyserver_export(STRLIST users)
{ {
/* We better ask for confirmation when the user entered --send-keys STRLIST sl=NULL;
without arguments. Sending all keys might not be the thing he KEYDB_SEARCH_DESC desc;
intended to do */ int rc=0;
if (users || opt.batch || opt.answer_yes)
;
else if ( !cpr_get_answer_is_yes
("keyserver_export.send_all",
_("Do you really want to send all your "
"public keys to the keyserver? (y/N) ")))
return -1;
return keyserver_work(SEND,users,NULL,0); /* Weed out descriptors that we don't support sending */
for(;users;users=users->next)
{
classify_user_id (users->d, &desc);
if(desc.mode!=KEYDB_SEARCH_MODE_SHORT_KID &&
desc.mode!=KEYDB_SEARCH_MODE_LONG_KID &&
desc.mode!=KEYDB_SEARCH_MODE_FPR16 &&
desc.mode!=KEYDB_SEARCH_MODE_FPR20)
{
log_error(_("\"%s\" not a key ID: skipping\n"),users->d);
continue;
}
else
append_to_strlist(&sl,users->d);
}
if(sl)
{
rc=keyserver_work(SEND,sl,NULL,0);
free_strlist(sl);
}
return rc;
} }
int int
@ -1174,7 +1190,7 @@ keyserver_import(STRLIST users)
desc[count].mode!=KEYDB_SEARCH_MODE_FPR16 && desc[count].mode!=KEYDB_SEARCH_MODE_FPR16 &&
desc[count].mode!=KEYDB_SEARCH_MODE_FPR20) desc[count].mode!=KEYDB_SEARCH_MODE_FPR20)
{ {
log_error(_("skipping invalid key ID \"%s\"\n"),users->d); log_error(_("\"%s\" not a key ID: skipping\n"),users->d);
continue; continue;
} }