diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 26 | ||||
| -rw-r--r-- | g10/card-util.c | 41 | ||||
| -rw-r--r-- | g10/keyedit.c | 95 | ||||
| -rw-r--r-- | g10/keyserver.c | 15 |
4 files changed, 95 insertions, 82 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 4f7620ba5..3f272fb40 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2004-12-14 Werner Koch <[email protected]> + + * keyserver.c (keyserver_work, keyserver_spawn): Map ldaps to ldap. + + * keyedit.c (keyedit_menu): Removed the N_() markers from the + command names. + * card-util.c (card_edit): Ditto. + 2004-12-13 Werner Koch <[email protected]> * passphrase.c (read_passphrase_from_fd): Fixed memory leak. @@ -2999,7 +3007,7 @@ 2003-04-10 Werner Koch <[email protected]> * passphrase.c (read_passphrase_from_fd): Do a dummy read if the - agent is to be used. Noted by Ingo Kl�cker. + agent is to be used. Noted by Ingo Klöcker. (agent_get_passphrase): Inhibit caching when we have no fingerprint. This is required for key generation as well as for symmetric only encryption. @@ -3942,7 +3950,7 @@ warning. * passphrase.c (agent_get_passphrase): Fixed signed/unsigned char - problem in %-escaping. Noted by Ingo Kl�cker. + problem in %-escaping. Noted by Ingo Klöcker. 2002-10-03 David Shaw <[email protected]> @@ -8270,12 +8278,12 @@ Fri Feb 11 17:44:40 CET 2000 Werner Koch <[email protected]> Thu Feb 10 17:39:44 CET 2000 Werner Koch <[email protected]> * keyedit.c (menu_expire): Fixed segv due to unitialized sub_pk. - By R�mi. + By Rémi. Thu Feb 10 11:39:41 CET 2000 Werner Koch <[email protected]> * keylist.c (list_keyblock): Don't print warnings in the middle of - regulat output lines. By R�mi. + regulat output lines. By Rémi. * sig-check.c: Include options.h @@ -8865,7 +8873,7 @@ Mon May 31 19:41:10 CEST 1999 Werner Koch <[email protected]> * g10.c (main): Fix for SHM init (Michael). * compress.c, encr-data.c, mdfilter.c, - plaintext.c, free-packet.c: Speed patches (R�mi). + plaintext.c, free-packet.c: Speed patches (Rémi). Thu May 27 09:40:55 CEST 1999 Werner Koch <[email protected]> @@ -8890,7 +8898,7 @@ Wed May 26 14:36:29 CEST 1999 Werner Koch <[email protected]> Tue May 25 19:50:32 CEST 1999 Werner Koch <[email protected]> * sign.c (sign_file): Always use compression algo 1 for signed - onyl file becuase we can� be sure the the verifier supports other + onyl file becuase we can´ be sure the the verifier supports other algorithms. * build-packet.c (build_sig_subpkt): Support for notation data. @@ -9080,7 +9088,7 @@ Wed Apr 7 20:51:39 CEST 1999 Werner Koch <[email protected]> (protect_secret_key). Ditto. * misc.c (print_cipher_algo_note): Twofish is now a standard algo. - * keygen.c (do_create): Fixed spelling (Ga�l Qu�ri) + * keygen.c (do_create): Fixed spelling (Gaël Quéri) (ask_keysize): Only allow keysizes up to 4096 * ringedit.c (add_keyblock_resource): chmod newly created secrings. @@ -9123,7 +9131,7 @@ Wed Mar 17 13:09:03 CET 1999 Werner Koch <[email protected]> * trustdb.c (insert_trust_record): Always use the primary key. - * encode.c (encode_simple): Added text_mode filter (R�mi Guyomarch) + * encode.c (encode_simple): Added text_mode filter (Rémi Guyomarch) (encode_crypt): Ditto. * mainproc.c (proc_pubkey_enc): Added status ENC_TO. @@ -10504,7 +10512,7 @@ Wed Apr 8 13:40:33 1998 Werner Koch ([email protected]) Wed Apr 8 09:47:21 1998 Werner Koch ([email protected]) - * sig-check.c (do_check): Applied small fix from Ulf M�ller. + * sig-check.c (do_check): Applied small fix from Ulf Möller. Tue Apr 7 19:28:07 1998 Werner Koch ([email protected]) diff --git a/g10/card-util.c b/g10/card-util.c index c180b3825..8d38fb416 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -1247,29 +1247,26 @@ card_edit (STRLIST commands) int admin_only; const char *desc; } cmds[] = { - { N_("quit") , cmdQUIT , 0, N_("quit this menu") }, - { N_("q") , cmdQUIT , 0, NULL }, - { N_("admin") , cmdADMIN , 0, N_("show admin commands") }, - { N_("help") , cmdHELP , 0, N_("show this help") }, - { "?" , cmdHELP , 0, NULL }, - { N_("list") , cmdLIST , 0, N_("list all available data") }, - { N_("l") , cmdLIST , 0, NULL }, - { N_("debug") , cmdDEBUG , 0, NULL }, - { N_("name") , cmdNAME , 1, N_("change card holder's name") }, - { N_("url") , cmdURL , 1, N_("change URL to retrieve key") }, - { N_("fetch") , cmdFETCH , 0, - N_("fetch the key specified in the card URL") }, - { N_("login") , cmdLOGIN , 1, N_("change the login name") }, - { N_("lang") , cmdLANG , 1, N_("change the language preferences") }, - { N_("sex") , cmdSEX , 1, N_("change card holder's sex") }, - { N_("cafpr"), cmdCAFPR, 1, N_("change a CA fingerprint") }, - { N_("forcesig"), - cmdFORCESIG, 1, N_("toggle the signature force PIN flag") }, - { N_("generate"), - cmdGENERATE, 1, N_("generate new keys") }, - { N_("passwd"), cmdPASSWD, 0, N_("menu to change or unblock the PIN") }, + { "quit" , cmdQUIT , 0, N_("quit this menu")}, + { "q" , cmdQUIT , 0, NULL }, + { "admin" , cmdADMIN , 0, N_("show admin commands")}, + { "help" , cmdHELP , 0, N_("show this help")}, + { "?" , cmdHELP , 0, NULL }, + { "list" , cmdLIST , 0, N_("list all available data")}, + { "l" , cmdLIST , 0, NULL }, + { "debug" , cmdDEBUG , 0, NULL }, + { "name" , cmdNAME , 1, N_("change card holder's name")}, + { "url" , cmdURL , 1, N_("change URL to retrieve key")}, + { "fetch" , cmdFETCH , 0, N_("fetch the key specified in the card URL")}, + { "login" , cmdLOGIN , 1, N_("change the login name")}, + { "lang" , cmdLANG , 1, N_("change the language preferences")}, + { "sex" , cmdSEX , 1, N_("change card holder's sex")}, + { "cafpr" , cmdCAFPR , 1, N_("change a CA fingerprint")}, + { "forcesig", cmdFORCESIG, 1, N_("toggle the signature force PIN flag")}, + { "generate", cmdGENERATE, 1, N_("generate new keys")}, + { "passwd" , cmdPASSWD, 0, N_("menu to change or unblock the PIN")}, /* Note, that we do not announce this command yet. */ - { N_("privatedo"), cmdPRIVATEDO, 0, NULL }, + { "privatedo", cmdPRIVATEDO, 0, NULL }, { NULL, cmdINVCMD, 0, NULL } }; diff --git a/g10/keyedit.c b/g10/keyedit.c index 94be382de..afae1bb2c 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1242,56 +1242,57 @@ keyedit_menu( const char *username, STRLIST locusr, int not_with_sk; /* but 2 == must use SK */ const char *desc; } cmds[] = { - { N_("quit") , cmdQUIT , 0,0, N_("quit this menu") }, - { N_("q") , cmdQUIT , 0,0, NULL }, - { N_("save") , cmdSAVE , 0,0, N_("save and quit") }, - { N_("help") , cmdHELP , 0,0, N_("show this help") }, - { "?" , cmdHELP , 0,0, NULL }, - { N_("fpr") , cmdFPR , 0,0, N_("show fingerprint") }, - { N_("list") , cmdLIST , 0,0, N_("list key and user IDs") }, - { N_("l") , cmdLIST , 0,0, NULL }, - { N_("uid") , cmdSELUID , 0,0, N_("select user ID N") }, - { N_("key") , cmdSELKEY , 0,0, N_("select secondary key N") }, - { N_("check") , cmdCHECK , 0,0, N_("list signatures") }, - { N_("c") , cmdCHECK , 0,0, NULL }, - { N_("sign") , cmdSIGN , 0,1, N_("sign the key") }, - { N_("s") , cmdSIGN , 0,1, NULL }, - { N_("tsign") , cmdTSIGN , 0,1, N_("make a trust signature")}, - { N_("lsign") , cmdLSIGN , 0,1, N_("sign the key locally") }, - { N_("nrsign") , cmdNRSIGN , 0,1, N_("sign the key non-revocably") }, - { N_("nrlsign") , cmdNRLSIGN , 0,1, N_("sign the key locally and non-revocably") }, - { N_("debug") , cmdDEBUG , 0,0, NULL }, - { N_("adduid") , cmdADDUID , 1,1, N_("add a user ID") }, - { N_("addphoto"), cmdADDPHOTO , 1,1, N_("add a photo ID") }, - { N_("deluid") , cmdDELUID , 0,1, N_("delete user ID") }, + { "quit" , cmdQUIT , 0,0, N_("quit this menu") }, + { "q" , cmdQUIT , 0,0, NULL }, + { "save" , cmdSAVE , 0,0, N_("save and quit") }, + { "help" , cmdHELP , 0,0, N_("show this help") }, + { "?" , cmdHELP , 0,0, NULL }, + { "fpr" , cmdFPR , 0,0, N_("show fingerprint") }, + { "list" , cmdLIST , 0,0, N_("list key and user IDs") }, + { "l" , cmdLIST , 0,0, NULL }, + { "uid" , cmdSELUID , 0,0, N_("select user ID N") }, + { "key" , cmdSELKEY , 0,0, N_("select secondary key N") }, + { "check" , cmdCHECK , 0,0, N_("list signatures") }, + { "c" , cmdCHECK , 0,0, NULL }, + { "sign" , cmdSIGN , 0,1, N_("sign the key") }, + { "s" , cmdSIGN , 0,1, NULL }, + { "tsign" , cmdTSIGN , 0,1, N_("make a trust signature")}, + { "lsign" , cmdLSIGN , 0,1, N_("sign the key locally") }, + { "nrsign" , cmdNRSIGN , 0,1, N_("sign the key non-revocably") }, + { "nrlsign" , cmdNRLSIGN , 0,1, N_("sign the key locally " + "and non-revocably") }, + { "debug" , cmdDEBUG , 0,0, NULL }, + { "adduid" , cmdADDUID , 1,1, N_("add a user ID") }, + { "addphoto" , cmdADDPHOTO , 1,1, N_("add a photo ID") }, + { "deluid" , cmdDELUID , 0,1, N_("delete user ID") }, /* delphoto is really deluid in disguise */ - { N_("delphoto"), cmdDELUID , 0,1, NULL }, - { N_("addkey") , cmdADDKEY , 1,1, N_("add a secondary key") }, + { "delphoto" , cmdDELUID , 0,1, NULL }, + { "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_("keytocard"), cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")}, + { "addcardkey", cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") }, + { "keytocard", cmdKEYTOCARD , 1,2, N_("move 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") }, - { N_("expire") , cmdEXPIRE , 1,1, N_("change the expire date") }, - { N_("primary") , cmdPRIMARY , 1,1, N_("flag user ID as primary")}, - { N_("toggle") , cmdTOGGLE , 1,0, N_("toggle between secret " - "and public key listing") }, - { N_("t" ) , cmdTOGGLE , 1,0, NULL }, - { N_("pref") , cmdPREF , 0,1, N_("list preferences (expert)")}, - { N_("showpref"), cmdSHOWPREF , 0,1, N_("list preferences (verbose)") }, - { N_("setpref") , cmdSETPREF , 1,1, N_("set preference list") }, - { N_("updpref") , cmdUPDPREF , 1,1, N_("updated preferences") }, - { N_("keyserver"),cmdPREFKS , 1,1, N_("set preferred keyserver URL")}, - { N_("passwd") , cmdPASSWD , 1,1, N_("change the passphrase") }, - { N_("trust") , cmdTRUST , 0,1, N_("change the ownertrust") }, - { N_("revsig") , cmdREVSIG , 0,1, N_("revoke signatures") }, - { N_("revuid") , cmdREVUID , 1,1, N_("revoke a user ID") }, - { N_("revkey") , cmdREVKEY , 1,1, N_("revoke a secondary key") }, - { N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") }, - { N_("enable") , cmdENABLEKEY , 0,1, N_("enable a key") }, - { N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") }, + { "delkey" , cmdDELKEY , 0,1, N_("delete a secondary key") }, + { "addrevoker",cmdADDREVOKER,1,1, N_("add a revocation key") }, + { "delsig" , cmdDELSIG , 0,1, N_("delete signatures") }, + { "expire" , cmdEXPIRE , 1,1, N_("change the expire date") }, + { "primary" , cmdPRIMARY , 1,1, N_("flag user ID as primary")}, + { "toggle" , cmdTOGGLE , 1,0, N_("toggle between secret " + "and public key listing") }, + { "t" , cmdTOGGLE , 1,0, NULL }, + { "pref" , cmdPREF , 0,1, N_("list preferences (expert)")}, + { "showpref" , cmdSHOWPREF , 0,1, N_("list preferences (verbose)") }, + { "setpref" , cmdSETPREF , 1,1, N_("set preference list") }, + { "updpref" , cmdUPDPREF , 1,1, N_("updated preferences") }, + { "keyserver",cmdPREFKS , 1,1, N_("set preferred keyserver URL")}, + { "passwd" , cmdPASSWD , 1,1, N_("change the passphrase") }, + { "trust" , cmdTRUST , 0,1, N_("change the ownertrust") }, + { "revsig" , cmdREVSIG , 0,1, N_("revoke signatures") }, + { "revuid" , cmdREVUID , 1,1, N_("revoke a user ID") }, + { "revkey" , cmdREVKEY , 1,1, N_("revoke a secondary key") }, + { "disable" , cmdDISABLEKEY, 0,1, N_("disable a key") }, + { "enable" , cmdENABLEKEY , 0,1, N_("enable a key") }, + { "showphoto",cmdSHOWPHOTO , 0,0, N_("show photo ID") }, { NULL, cmdNONE, 0, 0, NULL } }; enum cmdids cmd = 0; int rc = 0; diff --git a/g10/keyserver.c b/g10/keyserver.c index 744ce2cad..5084a7c15 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -789,10 +789,15 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, #endif /* Build the filename for the helper to execute */ + /* Note that we don't use a symlink for "ldaps" anymore because this + won't work under MS Windows. */ command=m_alloc(strlen("gpgkeys_")+strlen(keyserver->scheme)+1); - strcpy(command,"gpgkeys_"); - strcat(command,keyserver->scheme); - + strcpy(command,"gpgkeys_"); + if (!strcmp (keyserver->scheme, "ldaps")) + strcat(command, "ldap"); + else + strcat(command,keyserver->scheme); + if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES) { if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES) @@ -1247,7 +1252,9 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, case KEYSERVER_VERSION_ERROR: log_error(_("gpgkeys_%s does not support handler version %d\n"), - keyserver->scheme,KEYSERVER_PROTO_VERSION); + !strcmp (keyserver->scheme,"ldaps")? + "ldap": keyserver->scheme, + KEYSERVER_PROTO_VERSION); break; case KEYSERVER_TIMEOUT: |