mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-11 23:59:50 +02:00
c6a4a660fd
* agent/gpg-agent.c (oCheckSymPassphrasePattern): New.
(opts): Add --check-sym-passphrase-pattern.
(parse_rereadable_options): Set option.
(main): Return option info.
* tools/gpgconf-comp.c: Add new option.
* agent/agent.h (opt): Add var check_sym_passphrase_pattern.
(struct pin_entry_info_s): Add var constraints_flags.
(CHECK_CONSTRAINTS_NOT_EMPTY): New to replace a hardwired 1.
(CHECK_CONSTRAINTS_NEW_SYMKEY): New.
* agent/genkey.c (check_passphrase_pattern): Rename to ...
(do_check_passphrase_pattern): this to make code reading
easier. Handle the --check-sym-passphrase-pattern option.
(check_passphrase_constraints): Replace arg no_empty by a generic
flags arg. Also handle --check-sym-passphrase-pattern here.
* agent/command.c (cmd_get_passphrase): In --newsymkey mode pass
CHECK_CONSTRAINTS_NEW_SYMKEY flag.
* agent/call-pinentry.c (struct entry_parm_s): Add constraints_flags.
(struct inq_cb_parm_s): New.
(inq_cb): Use new struct for parameter passing. Pass flags to teh
constraints checking.
(do_getpin): Pass constraints flag down.
(agent_askpin): Take constraints flag from the supplied pinentry
struct.
--
Requirements for a passphrase to protect a private key and for a
passphrase used for symmetric encryption are different. Thus a
the use of a different pattern file will be useful. Note that a
pattern file can be used to replace the other passphrase constraints
options and thus we don't need to duplicate them for symmetric
encryption.
GnuPG-bug-id: 5517
Signed-off-by: Werner Koch <wk@gnupg.org>
Backported-from-master:
|
||
|---|---|---|
| .. | ||
| agent.h | ||
| all-tests.scm | ||
| cache.c | ||
| call-pinentry.c | ||
| call-scd.c | ||
| ChangeLog-2011 | ||
| command-ssh.c | ||
| command.c | ||
| cvt-openpgp.c | ||
| cvt-openpgp.h | ||
| divert-scd.c | ||
| findkey.c | ||
| genkey.c | ||
| gpg-agent-w32info.rc | ||
| gpg-agent.c | ||
| gpg-agent.w32-manifest.in | ||
| keyformat.txt | ||
| learncard.c | ||
| Makefile.am | ||
| pkdecrypt.c | ||
| pksign.c | ||
| preset-passphrase.c | ||
| protect-tool.c | ||
| protect.c | ||
| t-protect.c | ||
| trans.c | ||
| trustlist.c | ||
| w32main.c | ||
| w32main.h | ||