diff options
| author | David Shaw <[email protected]> | 2004-09-21 22:24:47 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-09-21 22:24:47 +0000 |
| commit | f0279fc10d26ece24b4388c013b89269d5acca7c (patch) | |
| tree | 2cd4272ed105256efcdda26f6bc304c3b411ebe9 | |
| parent | * gpg.sgml: Document -K. (diff) | |
| download | gnupg-f0279fc10d26ece24b4388c013b89269d5acca7c.tar.gz gnupg-f0279fc10d26ece24b4388c013b89269d5acca7c.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/keydb.h | 2 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/keyserver.c | 8 |
4 files changed, 15 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 0b8837316..54d766c56 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2004-09-21 David Shaw <[email protected]> + + * 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 <[email protected]> * g10.c: Make -K an alias for --list-secret-keys. diff --git a/g10/keydb.h b/g10/keydb.h index c28ed5f52..e3f53a336 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -136,7 +136,7 @@ struct keydb_search_desc { void *skipfncvalue; union { const char *name; - char fpr[MAX_FINGERPRINT_LEN]; + byte fpr[MAX_FINGERPRINT_LEN]; u32 kid[2]; } u; int exact; diff --git a/g10/keyedit.c b/g10/keyedit.c index 014f3a8c0..95213f7d1 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1224,7 +1224,9 @@ keyedit_menu( const char *username, STRLIST locusr, /* delphoto is really deluid in disguise */ { N_("delphoto"), cmdDELUID , 0,1, NULL }, { 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") }, +#endif /* ENABLE_CARD_SUPPORT */ { N_("delkey") , cmdDELKEY , 0,1, N_("delete a secondary key") }, { N_("addrevoker"),cmdADDREVOKER,1,1, N_("add a revocation key") }, { N_("delsig") , cmdDELSIG , 0,1, N_("delete signatures") }, diff --git a/g10/keyserver.c b/g10/keyserver.c index dc1230c64..ab3c18dab 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -346,13 +346,13 @@ print_keyrec(int number,struct keyrec *keyrec) case KEYDB_SEARCH_MODE_FPR16: printf("key "); for(i=0;i<16;i++) - printf("%02X",(unsigned char)keyrec->desc.u.fpr[i]); + printf("%02X",keyrec->desc.u.fpr[i]); break; case KEYDB_SEARCH_MODE_FPR20: printf("key "); for(i=0;i<20;i++) - printf("%02X",(unsigned char)keyrec->desc.u.fpr[i]); + printf("%02X",keyrec->desc.u.fpr[i]); break; default: @@ -859,7 +859,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, fprintf(spawn->tochild,"0x"); 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"); } @@ -870,7 +870,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, fprintf(spawn->tochild,"0x"); 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"); } |