diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 10 | ||||
| -rw-r--r-- | g10/delkey.c | 2 | ||||
| -rw-r--r-- | g10/export.c | 2 | ||||
| -rw-r--r-- | g10/getkey.c | 2 | ||||
| -rw-r--r-- | g10/keyserver.c | 8 | ||||
| -rw-r--r-- | g10/revoke.c | 4 | ||||
| -rw-r--r-- | g10/trustdb.c | 2 |
7 files changed, 20 insertions, 10 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a1c608f76..8b22df854 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,13 @@ +2011-04-25 Werner Koch <[email protected]> + + * delkey.c (do_delete_key): Mark classify_user_id for use with + OpenPGP. + * trustdb.c (register_trusted_key): Ditto. + * revoke.c (gen_revoke): Ditto. + * keyserver.c (keyserver_export, keyidlist, keyserver_export): Ditto. + * getkey.c (key_byname): Ditto. + * export.c (do_export_stream): Ditto. + 2011-04-20 Marcus Brinkmann <[email protected]> * keylist.c (list_keyblock_colon): Use get_ownertrust_info, not diff --git a/g10/delkey.c b/g10/delkey.c index 978549826..3b47c4049 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -63,7 +63,7 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail ) *r_sec_avail = 0; /* Search the userid */ - rc = classify_user_id (username, &desc); + rc = classify_user_id (username, &desc, 1); exactmatch = (desc.mode == KEYDB_SEARCH_MODE_FPR || desc.mode == KEYDB_SEARCH_MODE_FPR16 || desc.mode == KEYDB_SEARCH_MODE_FPR20); diff --git a/g10/export.c b/g10/export.c index 191f68b8b..9f4959e61 100644 --- a/g10/export.c +++ b/g10/export.c @@ -752,7 +752,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret, for (ndesc=0, sl=users; sl; sl = sl->next) { - if (!(err=classify_user_id (sl->d, desc+ndesc))) + if (!(err=classify_user_id (sl->d, desc+ndesc, 1))) ndesc++; else log_error (_("key \"%s\" not found: %s\n"), diff --git a/g10/getkey.c b/g10/getkey.c index 6464f9e0f..171f17781 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -617,7 +617,7 @@ key_byname (GETKEY_CTX *retctx, strlist_t namelist, { gpg_error_t err; - err = classify_user_id (r->d, &ctx->items[n]); + err = classify_user_id (r->d, &ctx->items[n], 1); if (ctx->items[n].exact) ctx->exact = 1; diff --git a/g10/keyserver.c b/g10/keyserver.c index 31c7133d6..5cc7438ad 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -626,7 +626,7 @@ parse_keyrec(char *keystring) if((tok=strsep(&keystring,":"))==NULL) return ret; - err = classify_user_id (tok, &work->desc); + err = classify_user_id (tok, &work->desc, 1); if (err || (work->desc.mode != KEYDB_SEARCH_MODE_SHORT_KID && work->desc.mode != KEYDB_SEARCH_MODE_LONG_KID && work->desc.mode != KEYDB_SEARCH_MODE_FPR16 @@ -996,7 +996,7 @@ keyserver_export (ctrl_t ctrl, strlist_t users) /* Weed out descriptors that we don't support sending */ for(;users;users=users->next) { - err = classify_user_id (users->d, &desc); + err = classify_user_id (users->d, &desc, 1); if (err || (desc.mode != KEYDB_SEARCH_MODE_SHORT_KID && desc.mode != KEYDB_SEARCH_MODE_LONG_KID && desc.mode != KEYDB_SEARCH_MODE_FPR16 @@ -1031,7 +1031,7 @@ keyserver_import (ctrl_t ctrl, strlist_t users) for(;users;users=users->next) { - err = classify_user_id (users->d, &desc[count]); + err = classify_user_id (users->d, &desc[count], 1); if (err || (desc[count].mode != KEYDB_SEARCH_MODE_SHORT_KID && desc[count].mode != KEYDB_SEARCH_MODE_LONG_KID && desc[count].mode != KEYDB_SEARCH_MODE_FPR16 @@ -1125,7 +1125,7 @@ keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3) for (ndesc=0, sl=users; sl; sl = sl->next) { gpg_error_t err; - if (!(err = classify_user_id (sl->d, desc+ndesc))) + if (!(err = classify_user_id (sl->d, desc+ndesc, 1))) ndesc++; else log_error (_("key \"%s\" not found: %s\n"), diff --git a/g10/revoke.c b/g10/revoke.c index 3beeacfe1..c18dfb989 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -220,7 +220,7 @@ gen_desig_revoke( const char *uname, strlist_t locusr ) afx = new_armor_context (); kdbhd = keydb_new (); - rc = classify_user_id (uname, &desc); + rc = classify_user_id (uname, &desc, 1); if (!rc) rc = keydb_search (kdbhd, &desc, 1); if (rc) { @@ -463,7 +463,7 @@ gen_revoke (const char *uname) /* Search the userid; we don't want the whole getkey stuff here. */ kdbhd = keydb_new (); - rc = classify_user_id (uname, &desc); + rc = classify_user_id (uname, &desc, 1); if (!rc) rc = keydb_search (kdbhd, &desc, 1); if (rc) diff --git a/g10/trustdb.c b/g10/trustdb.c index c8964323e..c6ff6922d 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -217,7 +217,7 @@ register_trusted_key( const char *string ) gpg_error_t err; KEYDB_SEARCH_DESC desc; - err = classify_user_id (string, &desc); + err = classify_user_id (string, &desc, 1); if (err || desc.mode != KEYDB_SEARCH_MODE_LONG_KID ) { log_error(_("`%s' is not a valid long keyID\n"), string ); |