security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* keyedit.c (keyedit_menu): Don't show "addcardkey" in the menu if we do

Browse Source 
not have card support.

* keydb.h, keyserver.c (print_keyrec, keyserver_spawn): fpr is an array of
unsigned bytes.
This commit is contained in:
David Shaw 2004-09-21 22:24:47 +00:00
parent 9d17a635c9
commit f0279fc10d
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2004-09-21 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (keyedit_menu): Don't show "addcardkey" in the menu if
we do not have card support.
* keydb.h, keyserver.c (print_keyrec, keyserver_spawn): fpr is an
array of unsigned bytes.
2004-09-20 Werner Koch <wk@g10code.com> 2004-09-20 Werner Koch <wk@g10code.com>
* g10.c: Make -K an alias for --list-secret-keys. * g10.c: Make -K an alias for --list-secret-keys.

2
g10/keydb.h
View File

@ -136,7 +136,7 @@ struct keydb_search_desc {
void *skipfncvalue; void *skipfncvalue;
union { union {
const char *name; const char *name;
char fpr[MAX_FINGERPRINT_LEN]; byte fpr[MAX_FINGERPRINT_LEN];
u32 kid[2]; u32 kid[2];
} u; } u;
int exact; int exact;

2
g10/keyedit.c
View File

@ -1224,7 +1224,9 @@ keyedit_menu( const char *username, STRLIST locusr,
/* delphoto is really deluid in disguise */ /* delphoto is really deluid in disguise */
{ N_("delphoto"), cmdDELUID , 0,1, NULL }, { N_("delphoto"), cmdDELUID , 0,1, NULL },
{ N_("addkey") , cmdADDKEY , 1,1, N_("add a secondary key") }, { N_("addkey") , cmdADDKEY , 1,1, N_("add a secondary key") },
#ifdef ENABLE_CARD_SUPPORT
{ N_("addcardkey"), cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") }, { N_("addcardkey"), cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") },
#endif /* ENABLE_CARD_SUPPORT */
{ N_("delkey") , cmdDELKEY , 0,1, N_("delete a secondary key") }, { N_("delkey") , cmdDELKEY , 0,1, N_("delete a secondary key") },
{ N_("addrevoker"),cmdADDREVOKER,1,1, N_("add a revocation key") }, { N_("addrevoker"),cmdADDREVOKER,1,1, N_("add a revocation key") },
{ N_("delsig") , cmdDELSIG , 0,1, N_("delete signatures") }, { N_("delsig") , cmdDELSIG , 0,1, N_("delete signatures") },

8
g10/keyserver.c
View File

@ -346,13 +346,13 @@ print_keyrec(int number,struct keyrec *keyrec)
case KEYDB_SEARCH_MODE_FPR16: case KEYDB_SEARCH_MODE_FPR16:
printf("key "); printf("key ");
for(i=0;i<16;i++) for(i=0;i<16;i++)
printf("%02X",(unsigned char)keyrec->desc.u.fpr[i]); printf("%02X",keyrec->desc.u.fpr[i]);
break; break;
case KEYDB_SEARCH_MODE_FPR20: case KEYDB_SEARCH_MODE_FPR20:
printf("key "); printf("key ");
for(i=0;i<20;i++) for(i=0;i<20;i++)
printf("%02X",(unsigned char)keyrec->desc.u.fpr[i]); printf("%02X",keyrec->desc.u.fpr[i]);
break; break;
default: default:
@ -859,7 +859,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
fprintf(spawn->tochild,"0x"); fprintf(spawn->tochild,"0x");
for(f=0;f<MAX_FINGERPRINT_LEN;f++) for(f=0;f<MAX_FINGERPRINT_LEN;f++)
fprintf(spawn->tochild,"%02X",(byte)desc[i].u.fpr[f]); fprintf(spawn->tochild,"%02X",desc[i].u.fpr[f]);
fprintf(spawn->tochild,"\n"); fprintf(spawn->tochild,"\n");
} }
@ -870,7 +870,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
fprintf(spawn->tochild,"0x"); fprintf(spawn->tochild,"0x");
for(f=0;f<16;f++) for(f=0;f<16;f++)
fprintf(spawn->tochild,"%02X",(byte)desc[i].u.fpr[f]); fprintf(spawn->tochild,"%02X",desc[i].u.fpr[f]);
fprintf(spawn->tochild,"\n"); fprintf(spawn->tochild,"\n");
} }