equal
deleted
inserted
replaced
245 void main_init_pgp(void) |
245 void main_init_pgp(void) |
246 { |
246 { |
247 #ifdef HAVE_GPGME |
247 #ifdef HAVE_GPGME |
248 const char *pk, *pp; |
248 const char *pk, *pp; |
249 char *typed_passwd = NULL; |
249 char *typed_passwd = NULL; |
250 char *p; |
|
251 bool pgp_invalid = FALSE; |
250 bool pgp_invalid = FALSE; |
252 bool pgp_agent; |
251 bool pgp_agent; |
253 |
252 //char *p; |
254 p = getenv("GPG_AGENT_INFO"); |
253 |
255 pgp_agent = (p && strchr(p, ':')); |
254 //p = getenv("GPG_AGENT_INFO"); |
|
255 //pgp_agent = (p && strchr(p, ':')); |
|
256 pgp_agent = FALSE; |
256 |
257 |
257 pk = settings_opt_get("pgp_private_key"); |
258 pk = settings_opt_get("pgp_private_key"); |
258 pp = settings_opt_get("pgp_passphrase"); |
259 pp = settings_opt_get("pgp_passphrase"); |
259 if (!pk) { |
260 if (!pk) { |
260 scr_LogPrint(LPRINT_LOGNORM, "WARNING: unkown PGP private key"); |
261 scr_LogPrint(LPRINT_LOGNORM, "WARNING: unkown PGP private key"); |