summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2007-01-25 10:15:10 +0100
committerWerner Koch <wk@gnupg.org>2007-01-25 10:15:10 +0100
commit39fbda4e3c1165ea140ea206967798b73265754b (patch)
tree1734282ca7b00c3cb85151fcb4ccf81abe9fc801 /common
parentagent/ (diff)
downloadgnupg2-39fbda4e3c1165ea140ea206967798b73265754b.tar.xz
gnupg2-39fbda4e3c1165ea140ea206967798b73265754b.zip
agent/
* genkey.c (check_passphrase_constraints): Get ngettext call right.
Diffstat (limited to 'common')
-rw-r--r--common/simple-pwquery.c16
-rw-r--r--common/simple-pwquery.h10
2 files changed, 16 insertions, 10 deletions
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index e405c1ec0..f0c1cdc00 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -426,17 +426,19 @@ copy_and_escape (char *buffer, const char *text)
/* Ask the gpg-agent for a passphrase and present the user with a
- DESCRIPTION, a PROMPT and optiaonlly with a TRYAGAIN extra text.
+ DESCRIPTION, a PROMPT and optionally with a TRYAGAIN extra text.
If a CACHEID is not NULL it is used to locate the passphrase in in
- the cache and store it under this ID. If ERRORCODE is not NULL it
- should point a variable receiving an errorcode; thsi errocode might
- be 0 if the user canceled the operation. The function returns NULL
- to indicate an error. */
+ the cache and store it under this ID. If OPT_CHECK is true
+ gpg-agent is asked to apply some checks on the passphrase security.
+ If ERRORCODE is not NULL it should point a variable receiving an
+ errorcode; this errocode might be 0 if the user canceled the
+ operation. The function returns NULL to indicate an error. */
char *
simple_pwquery (const char *cacheid,
const char *tryagain,
const char *prompt,
const char *description,
+ int opt_check,
int *errorcode)
{
int fd = -1;
@@ -463,7 +465,7 @@ simple_pwquery (const char *cacheid,
char *line;
/* We allocate 3 times the needed space so that there is enough
space for escaping. */
- line = spwq_malloc (15
+ line = spwq_malloc (15 + 10
+ 3*strlen (cacheid) + 1
+ 3*strlen (tryagain) + 1
+ 3*strlen (prompt) + 1
@@ -476,6 +478,8 @@ simple_pwquery (const char *cacheid,
}
strcpy (line, "GET_PASSPHRASE ");
p = line+15;
+ if (opt_check)
+ p = stpcpy (p, "--check ");
p = copy_and_escape (p, cacheid);
*p++ = ' ';
p = copy_and_escape (p, tryagain);
diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h
index 5b941d06f..ab2724ffa 100644
--- a/common/simple-pwquery.h
+++ b/common/simple-pwquery.h
@@ -48,14 +48,16 @@
/* Ask the gpg-agent for a passphrase and present the user with a
DESCRIPTION, a PROMPT and optiaonlly with a TRYAGAIN extra text.
If a CACHEID is not NULL it is used to locate the passphrase in in
- the cache and store it under this ID. If ERRORCODE is not NULL it
- should point a variable receiving an errorcode; this errocode might
- be 0 if the user canceled the operation. The function returns NULL
- to indicate an error. */
+ the cache and store it under this ID. If OPT_CHECK is true
+ gpg-agent is asked to apply some checks on the passphrase security.
+ If ERRORCODE is not NULL it should point a variable receiving an
+ errorcode; this errocode might be 0 if the user canceled the
+ operation. The function returns NULL to indicate an error. */
char *simple_pwquery (const char *cacheid,
const char *tryagain,
const char *prompt,
const char *description,
+ int opt_check,
int *errorcode);
/* Ask the gpg-agent to clear the passphrase for the cache ID CACHEID. */