From b451c4f5ea672c9915e28d8dde30abc675060f06 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 8 Jul 2020 14:54:10 +0200
Subject: [PATCH] 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>
---
 agent/genkey.c   | 2 +-
 g10/call-agent.c | 2 +-
 sm/call-agent.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agent/genkey.c b/agent/genkey.c
index b0aa47582..cddd67d9a 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -386,7 +386,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 1eaef07d5..7c08c9b36 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -1591,7 +1591,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 281e47902..d9c419ee2 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -1248,7 +1248,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);