security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* keyserver.c (parse_keyrec): Force the 'e'xpired flag on as soon as we

Browse Source 
know the key is definitely expired.  Some translatable string cleanup.
This commit is contained in:
David Shaw 2004-09-03 22:06:36 +00:00
parent 159352d8b7
commit d4ca1e8cbc
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2004-09-03 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (parse_keyrec): Force the 'e'xpired flag on as soon
as we know the key is definitely expired. Some translatable
string cleanup.
2004-08-27 David Shaw <dshaw@jabberwocky.com> 2004-08-27 David Shaw <dshaw@jabberwocky.com>
* encode.c, exec.c, g10.c, sign.c: Some translatable string * encode.c, exec.c, g10.c, sign.c: Some translatable string

29
g10/keyserver.c
View File

@ -95,8 +95,8 @@ parse_keyserver_options(char *options)
#ifdef EXEC_TEMPFILE_ONLY #ifdef EXEC_TEMPFILE_ONLY
else if(ascii_strncasecmp(tok,"use-temp-files",14)==0 || else if(ascii_strncasecmp(tok,"use-temp-files",14)==0 ||
ascii_strncasecmp(tok,"no-use-temp-files",17)==0) ascii_strncasecmp(tok,"no-use-temp-files",17)==0)
log_info(_("WARNING: keyserver option \"%s\" is not used " log_info(_("WARNING: keyserver option %s is not used"
"on this platform\n"),tok); " on this platform\n"),tok);
#else #else
else if(ascii_strncasecmp(tok,"use-temp-files",14)==0) else if(ascii_strncasecmp(tok,"use-temp-files",14)==0)
opt.keyserver_options.options|=KEYSERVER_USE_TEMP_FILES; opt.keyserver_options.options|=KEYSERVER_USE_TEMP_FILES;
@ -473,7 +473,12 @@ parse_keyrec(char *keystring)
if(atoi(tok)<0) if(atoi(tok)<0)
work->expiretime=0; work->expiretime=0;
else else
work->expiretime=atoi(tok); {
work->expiretime=atoi(tok);
/* Force the 'e' flag on if this key is expired. */
if(work->expiretime<=make_timestamp())
work->flags|=4;
}
if((tok=strsep(&keystring,":"))==NULL) if((tok=strsep(&keystring,":"))==NULL)
return ret; return ret;
@ -496,9 +501,6 @@ parse_keyrec(char *keystring)
work->flags|=4; work->flags|=4;
break; break;
} }
if(work->expiretime && work->expiretime<=make_timestamp())
work->flags|=4;
} }
else if(ascii_strcasecmp("uid",record)==0 && work->desc.mode) else if(ascii_strcasecmp("uid",record)==0 && work->desc.mode)
{ {
@ -808,7 +810,8 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
if(ret) if(ret)
return ret; return ret;
fprintf(spawn->tochild,"# This is a gpg keyserver communications file\n"); fprintf(spawn->tochild,
"# This is a GnuPG %s keyserver communications file\n",VERSION);
fprintf(spawn->tochild,"VERSION %d\n",KEYSERVER_PROTO_VERSION); fprintf(spawn->tochild,"VERSION %d\n",KEYSERVER_PROTO_VERSION);
fprintf(spawn->tochild,"PROGRAM %s\n",VERSION); fprintf(spawn->tochild,"PROGRAM %s\n",VERSION);
fprintf(spawn->tochild,"SCHEME %s\n",keyserver->scheme); fprintf(spawn->tochild,"SCHEME %s\n",keyserver->scheme);
@ -1121,8 +1124,8 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
else if(ascii_strncasecmp(ptr,"PROGRAM ",8)==0) else if(ascii_strncasecmp(ptr,"PROGRAM ",8)==0)
{ {
if(ascii_strncasecmp(&ptr[8],VERSION,strlen(VERSION))!=0) if(ascii_strncasecmp(&ptr[8],VERSION,strlen(VERSION))!=0)
log_info(_("WARNING: keyserver handler from a different " log_info(_("WARNING: keyserver handler from a different"
"version of GnuPG (%s)\n"),&ptr[8]); " version of GnuPG (%s)\n"),&ptr[8]);
} }
else if(ascii_strncasecmp(ptr,"OPTION OUTOFBAND",16)==0) else if(ascii_strncasecmp(ptr,"OPTION OUTOFBAND",16)==0)
outofband=1; /* Currently the only OPTION */ outofband=1; /* Currently the only OPTION */
@ -1207,13 +1210,13 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
switch(ret) switch(ret)
{ {
case KEYSERVER_SCHEME_NOT_FOUND: case KEYSERVER_SCHEME_NOT_FOUND:
log_error(_("no handler for keyserver scheme \"%s\"\n"), log_error(_("no handler for keyserver scheme `%s'\n"),
keyserver->scheme); keyserver->scheme);
break; break;
case KEYSERVER_NOT_SUPPORTED: case KEYSERVER_NOT_SUPPORTED:
log_error(_("action \"%s\" not supported with keyserver " log_error(_("action `%s' not supported with keyserver "
"scheme \"%s\"\n"), "scheme `%s'\n"),
action==GET?"get":action==SEND?"send": action==GET?"get":action==SEND?"send":
action==SEARCH?"search":"unknown", action==SEARCH?"search":"unknown",
keyserver->scheme); keyserver->scheme);
@ -1380,7 +1383,7 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
if(classify_user_id (sl->d, desc+ndesc)) if(classify_user_id (sl->d, desc+ndesc))
ndesc++; ndesc++;
else else
log_error (_("key `%s' not found: %s\n"), log_error (_("key \"%s\" not found: %s\n"),
sl->d, g10_errstr (G10ERR_INV_USER_ID)); sl->d, g10_errstr (G10ERR_INV_USER_ID));
} }
} }