mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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.
This commit is contained in:
parent
d7e707170f
commit
d13c5bc244
14 changed files with 296 additions and 10 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue