Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/main.c @ 1799:e73cd9377a4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better UI message for password prompt
author Mikael Berthe <mikael@lilotux.net>
date Sat, 20 Mar 2010 15:11:13 +0100
parents e4378fbab5d7
children 8c2651fc217a
comparison
equal deleted inserted replaced
1798:21f02b1dee91 1799:e73cd9377a4e
221 if (!pk) { 221 if (!pk) {
222 scr_LogPrint(LPRINT_LOGNORM, "WARNING: unknown PGP private key"); 222 scr_LogPrint(LPRINT_LOGNORM, "WARNING: unknown PGP private key");
223 pgp_invalid = TRUE; 223 pgp_invalid = TRUE;
224 } else if (!(pp || pgp_agent)) { 224 } else if (!(pp || pgp_agent)) {
225 // Request PGP passphrase 225 // Request PGP passphrase
226 pp = typed_passwd = ask_password("PGP passphrase"); 226 pp = typed_passwd = ask_password("your PGP passphrase");
227 } 227 }
228 gpg_init(pk, pp); 228 gpg_init(pk, pp);
229 // Erase password from the settings array 229 // Erase password from the settings array
230 if (pp) { 230 if (pp) {
231 memset((char*)pp, 0, strlen(pp)); 231 memset((char*)pp, 0, strlen(pp));
236 } 236 }
237 if (!pgp_agent && pk && pp && gpg_test_passphrase()) { 237 if (!pgp_agent && pk && pp && gpg_test_passphrase()) {
238 // Let's check the pasphrase 238 // Let's check the pasphrase
239 int i; 239 int i;
240 for (i = 1; retries < 0 || i <= retries; i++) { 240 for (i = 1; retries < 0 || i <= retries; i++) {
241 typed_passwd = ask_password("PGP passphrase"); // Ask again... 241 typed_passwd = ask_password("your PGP passphrase"); // Ask again...
242 if (typed_passwd) { 242 if (typed_passwd) {
243 gpg_set_passphrase(typed_passwd); 243 gpg_set_passphrase(typed_passwd);
244 memset(typed_passwd, 0, strlen(typed_passwd)); 244 memset(typed_passwd, 0, strlen(typed_passwd));
245 g_free(typed_passwd); 245 g_free(typed_passwd);
246 } 246 }
389 printf("Server: %s\n", p); 389 printf("Server: %s\n", p);
390 p = settings_opt_get("jid"); 390 p = settings_opt_get("jid");
391 if (p) 391 if (p)
392 printf("User JID: %s\n", p); 392 printf("User JID: %s\n", p);
393 393
394 pwd = ask_password("Jabber password"); 394 pwd = ask_password("your Jabber password");
395 settings_set(SETTINGS_TYPE_OPTION, "password", pwd); 395 settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
396 g_free(pwd); 396 g_free(pwd);
397 } 397 }
398 398
399 /* Initialize PGP system 399 /* Initialize PGP system