diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/getkey.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 4d380a70d..76373af05 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2008-04-30 Werner Koch <[email protected]> + + * getkey.c (parse_auto_key_locate): Ignore nodefault and local + methods. + 2008-04-17 David Shaw <[email protected]> * parse-packet.c (parse_key): Add constant for Camellia-192. diff --git a/g10/getkey.c b/g10/getkey.c index 8cc1c9074..267eee541 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -3008,6 +3008,12 @@ parse_auto_key_locate(char *options) if(tok[0]=='\0') continue; + /* For now we silently ignore the new methods introduced with + 2.0.10. */ + if (!ascii_strcasecmp (tok,"nodefault") + || !ascii_strcasecmp (tok,"local")) + continue; + akl=xmalloc_clear(sizeof(*akl)); if(ascii_strcasecmp(tok,"ldap")==0) |