summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2020-07-08 14:54:10 +0200
committerWerner Koch <wk@gnupg.org>2020-07-08 14:54:10 +0200
commit999d25d47d45a0f594c84d51c041da0b24d68c5d (patch)
tree45aaf29bc026dc728e2ae79e26e09c53bae04ffd
parentgpgsm: Replace all assert calls by log_assert. (diff)
downloadgnupg2-999d25d47d45a0f594c84d51c041da0b24d68c5d.tar.xz
gnupg2-999d25d47d45a0f594c84d51c041da0b24d68c5d.zip
Do not use the pinentry's qualitybar
* agent/genkey.c (agent_ask_new_passphrase): No qualitybar. * g10/call-agent.c (agent_get_passphrase): Ditto. * sm/call-agent.c (gpgsm_agent_ask_passphrase): Ditto. -- The concept of a passphrase quality indicator is anyway questionable because user are smart enough to trick them out and they also tend to limit the actually used entropy. Except for the red/green switching (to show whether constraints are fulfilled) our qualitybar is pretty bad and thus worse than none. Signed-off-by: Werner Koch <wk@gnupg.org>
-rw-r--r--agent/genkey.c2
-rw-r--r--g10/call-agent.c2
-rw-r--r--sm/call-agent.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/agent/genkey.c b/agent/genkey.c
index 6f863db95..970876ba1 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -368,7 +368,7 @@ agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
}
pi->max_length = MAX_PASSPHRASE_LEN + 1;
pi->max_tries = 3;
- pi->with_qualitybar = 1;
+ pi->with_qualitybar = 0;
pi->with_repeat = 1;
pi2->max_length = MAX_PASSPHRASE_LEN + 1;
pi2->max_tries = 3;
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 858d81375..86040edc7 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -1940,7 +1940,7 @@ agent_get_passphrase (const char *cache_id,
snprintf (line, DIM(line),
"GET_PASSPHRASE --data --repeat=%d%s%s -- %s %s %s %s",
repeat,
- ((repeat && check) || newsymkey)? " --check --qualitybar":"",
+ ((repeat && check) || newsymkey)? " --check":"",
(have_newsymkey && newsymkey)? " --newsymkey":"",
arg1? arg1:"X",
arg2? arg2:"X",
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 9287091bc..5f0e8ed61 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -1322,7 +1322,7 @@ gpgsm_agent_ask_passphrase (ctrl_t ctrl, const char *desc_msg, int repeat,
return gpg_error_from_syserror ();
snprintf (line, DIM(line), "GET_PASSPHRASE --data%s -- X X X %s",
- repeat? " --repeat=1 --check --qualitybar":"",
+ repeat? " --repeat=1 --check":"",
arg4);
xfree (arg4);