security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

The keyserver search menu should honor --keyid-format

Browse Source 
* keyserver.c (print_keyrec): Honor --keyid-format when getting back
  full fingerprints from the keyserver (the comment in the code was
  correct, the code was not).
This commit is contained in:
David Shaw 2012-11-29 12:00:46 -05:00
parent 3d2da6c821
commit 7602d9e3ed
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/keyserver.c
View File

@ -1,6 +1,6 @@
/* keyserver.c - generic keyserver code /* keyserver.c - generic keyserver code
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
* 2009, 2011 Free Software Foundation, Inc. * 2009, 2011, 2012 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -529,21 +529,27 @@ print_keyrec(int number,struct keyrec *keyrec)
break; break;
/* However, if it gave us a long keyid, we can honor /* However, if it gave us a long keyid, we can honor
--keyid-format */ --keyid-format via keystr(). */
case KEYDB_SEARCH_MODE_LONG_KID: case KEYDB_SEARCH_MODE_LONG_KID:
es_printf ("key %s",keystr(keyrec->desc.u.kid)); es_printf ("key %s",keystr(keyrec->desc.u.kid));
break; break;
/* If it gave us a PGP 2.x fingerprint, not much we can do
beyond displaying it. */
case KEYDB_SEARCH_MODE_FPR16: case KEYDB_SEARCH_MODE_FPR16:
es_printf ("key "); es_printf ("key ");
for(i=0;i<16;i++) for(i=0;i<16;i++)
es_printf ("%02X",keyrec->desc.u.fpr[i]); es_printf ("%02X",keyrec->desc.u.fpr[i]);
break; break;
/* If we get a modern fingerprint, we have the most
flexibility. */
case KEYDB_SEARCH_MODE_FPR20: case KEYDB_SEARCH_MODE_FPR20:
es_printf ("key "); {
for(i=0;i<20;i++) u32 kid[2];
es_printf ("%02X", keyrec->desc.u.fpr[i]); keyid_from_fingerprint(keyrec->desc.u.fpr,20,kid);
es_printf("key %s",keystr(kid));
}
break; break;
default: default: