diff options
| author | Werner Koch <wk@gnupg.org> | 2021-04-19 11:33:19 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-04-19 11:33:19 +0200 |
| commit | d13c5bc244ce1daed285424d920171fc2bcd7290 (patch) | |
| tree | 510074df1671ad043855a00c347ea922a937c093 /tests | |
| parent | gpg: Lookup a missing public key of the current card via LDAP. (diff) | |
| download | gnupg2-d13c5bc244ce1daed285424d920171fc2bcd7290.tar.xz gnupg2-d13c5bc244ce1daed285424d920171fc2bcd7290.zip | |
gpg,gpgsm: Move use-keyboxd to the new conf file common.conf
* common/comopt.c, common/comopt.h: New.
* common/Makefile.am: Add them.
* g10/gpg.c: Include comopt.h.
(main): Also parse common.conf.
* sm/gpgsm.c: Include comopt.h.
(main): Set a flag for the --no-logfile option. Parse common.conf.
* tools/gpgconf-comp.c (known_options_gpg): Remove "use-keyboxd", add
pseudo option "use_keyboxd".
(known_pseudo_options_gpg): Add pseudo option "use_keyboxd".
(known_options_gpgsm): Remove "use-keyboxd".
* tests/openpgp/defs.scm (create-gpghome): Create common.conf.
* doc/examples/common.conf: New.
--
Note that --use-keybox still works but prints a warning. We will
eventually remove this option becuase it was marked as an experimental
feature anyway.
It would be too confusing if gpg and gpgsm use different key storages.
Further, other components (e.g. dirmngr or gpg-wks-client) which call
gpg or gpgsm need to be aware that the keyboxd is used and pass that
option on the command line. Now that common.conf is always read (even
if --no-options is used) those tools will work instantly.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/openpgp/defs.scm | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 984b63f0a..106e49cdf 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -272,7 +272,7 @@ CLEANFILES = prepared.stamp x y yy z out err $(data_files) \ plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \ *.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \ pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \ - secring.gpg pubring.pkr secring.skr \ + common.conf secring.gpg pubring.pkr secring.skr \ gnupg-test.stop random_seed gpg-agent.log tofu.db \ passphrases sshcontrol S.gpg-agent.ssh report.xml diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm index d26d38303..768d479aa 100644 --- a/tests/openpgp/defs.scm +++ b/tests/openpgp/defs.scm @@ -335,6 +335,11 @@ (if (flag "--use-keyring" *args*) (create-file "pubring.gpg")) + (create-file "common.conf" + (if (flag "--use-keyboxd" *args*) + "use-keyboxd" "#use-keyboxd") + ) + (create-file "gpg.conf" ;;"log-file socket:///tmp/S.wklog" ;;"verbose" @@ -352,8 +357,6 @@ (string-append "agent-program " (tool 'gpg-agent) "|--debug-quick-random\n") - (if (flag "--use-keyboxd" *args*) - "use-keyboxd" "#use-keyboxd") ) (create-file "keyboxd.conf" ;;"log-file socket:///tmp/S.wklog" |