mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
gpgconf: Support reading global options (part 2).
* tools/gpgconf-comp.c: Remove all regular option descriptions. They are now read in from the component. Also remove a few meanwhile obsolete options. * agent/gpg-agent.c: Add option description which were only set in gpgconf-comp.c. * dirmngr/dirmngr.c: Ditto. * scd/scdaemon.c: Ditto. * sm/gpgsm.c: Ditto. * g10/gpg.c: Ditto. -- This second part removes all regular option descriptions because they can be read from the components. A few were missing in the components and thus moved to there. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
d2425d1495
commit
4423e9dcde
@ -182,12 +182,14 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_n (oGrab, "grab",
|
||||
/* */ N_("let PIN-Entry grab keyboard and mouse")),
|
||||
ARGPARSE_s_n (oNoGrab, "no-grab", "@"),
|
||||
ARGPARSE_s_s (oLogFile, "log-file", N_("use a log file for the server")),
|
||||
ARGPARSE_s_s (oLogFile, "log-file",
|
||||
/* */ N_("|FILE|write server mode logs to FILE")),
|
||||
ARGPARSE_s_s (oPinentryProgram, "pinentry-program",
|
||||
/* */ N_("|PGM|use PGM as the PIN-Entry program")),
|
||||
ARGPARSE_s_s (oPinentryTouchFile, "pinentry-touch-file", "@"),
|
||||
ARGPARSE_s_s (oPinentryInvisibleChar, "pinentry-invisible-char", "@"),
|
||||
ARGPARSE_s_u (oPinentryTimeout, "pinentry-timeout", "@"),
|
||||
ARGPARSE_s_u (oPinentryTimeout, "pinentry-timeout",
|
||||
N_("|N|set the Pinentry timeout to N seconds")),
|
||||
ARGPARSE_s_s (oScdaemonProgram, "scdaemon-program",
|
||||
/* */ N_("|PGM|use PGM as the SCdaemon program") ),
|
||||
ARGPARSE_s_n (oDisableScdaemon, "disable-scdaemon",
|
||||
@ -217,18 +219,25 @@ static gpgrt_opt_t opts[] = {
|
||||
|
||||
ARGPARSE_s_u (oDefCacheTTL, "default-cache-ttl",
|
||||
N_("|N|expire cached PINs after N seconds")),
|
||||
ARGPARSE_s_u (oDefCacheTTLSSH, "default-cache-ttl-ssh", "@" ),
|
||||
ARGPARSE_s_u (oMaxCacheTTL, "max-cache-ttl", "@" ),
|
||||
ARGPARSE_s_u (oMaxCacheTTLSSH, "max-cache-ttl-ssh", "@" ),
|
||||
|
||||
ARGPARSE_s_u (oDefCacheTTLSSH, "default-cache-ttl-ssh",
|
||||
/* */ N_("|N|expire SSH keys after N seconds")),
|
||||
ARGPARSE_s_u (oMaxCacheTTL, "max-cache-ttl",
|
||||
/* */ N_("|N|set maximum PIN cache lifetime to N seconds")),
|
||||
ARGPARSE_s_u (oMaxCacheTTLSSH, "max-cache-ttl-ssh",
|
||||
/* */ N_("|N|set maximum SSH key lifetime to N seconds")),
|
||||
ARGPARSE_s_n (oEnforcePassphraseConstraints, "enforce-passphrase-constraints",
|
||||
/* */ "@"),
|
||||
ARGPARSE_s_u (oMinPassphraseLen, "min-passphrase-len", "@"),
|
||||
ARGPARSE_s_u (oMinPassphraseNonalpha, "min-passphrase-nonalpha", "@"),
|
||||
ARGPARSE_s_s (oCheckPassphrasePattern, "check-passphrase-pattern", "@"),
|
||||
ARGPARSE_s_u (oMaxPassphraseDays, "max-passphrase-days", "@"),
|
||||
ARGPARSE_s_n (oEnablePassphraseHistory, "enable-passphrase-history", "@"),
|
||||
|
||||
/* */ N_("do not allow bypassing the passphrase policy")),
|
||||
ARGPARSE_s_u (oMinPassphraseLen, "min-passphrase-len",
|
||||
N_("|N|set minimal required length for new passphrases to N")),
|
||||
ARGPARSE_s_u (oMinPassphraseNonalpha, "min-passphrase-nonalpha",
|
||||
N_("|N|require at least N non-alpha"
|
||||
" characters for a new passphrase")),
|
||||
ARGPARSE_s_s (oCheckPassphrasePattern, "check-passphrase-pattern",
|
||||
N_("|FILE|check new passphrases against pattern in FILE")),
|
||||
ARGPARSE_s_u (oMaxPassphraseDays, "max-passphrase-days",
|
||||
N_("|N|expire the passphrase after N days")),
|
||||
ARGPARSE_s_n (oEnablePassphraseHistory, "enable-passphrase-history",
|
||||
N_("do not allow the reuse of old passphrases")),
|
||||
ARGPARSE_s_n (oIgnoreCacheForSigning, "ignore-cache-for-signing",
|
||||
/* */ N_("do not use the PIN cache when signing")),
|
||||
ARGPARSE_s_n (oNoAllowExternalCache, "no-allow-external-cache",
|
||||
|
@ -227,7 +227,8 @@ static gpgrt_opt_t opts[] = {
|
||||
N_("|N|do not return more than N items in one query")),
|
||||
|
||||
ARGPARSE_s_s (oNameServer, "nameserver", "@"),
|
||||
ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
|
||||
ARGPARSE_s_s (oKeyServer, "keyserver",
|
||||
N_("|URL|use keyserver at URL")),
|
||||
ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
|
||||
N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
|
||||
|
||||
@ -250,7 +251,8 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_s (oHomedir, "homedir", "@"),
|
||||
ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"),
|
||||
ARGPARSE_s_s (oHTTPWrapperProgram, "http-wrapper-program", "@"),
|
||||
ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy", "@"),
|
||||
ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy",
|
||||
N_("use system's HTTP proxy setting")),
|
||||
ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"),
|
||||
ARGPARSE_s_n (oStandardResolver, "standard-resolver", "@"),
|
||||
ARGPARSE_s_n (oRecursiveResolver, "recursive-resolver", "@"),
|
||||
|
24
g10/gpg.c
24
g10/gpg.c
@ -567,7 +567,8 @@ static gpgrt_opt_t opts[] = {
|
||||
|
||||
ARGPARSE_s_s (oTempDir, "temp-directory", "@"),
|
||||
ARGPARSE_s_s (oExecPath, "exec-path", "@"),
|
||||
ARGPARSE_s_s (oEncryptTo, "encrypt-to", "@"),
|
||||
ARGPARSE_s_s (oEncryptTo, "encrypt-to",
|
||||
N_("|NAME|encrypt to user ID NAME as well")),
|
||||
ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
|
||||
ARGPARSE_s_s (oHiddenEncryptTo, "hidden-encrypt-to", "@"),
|
||||
ARGPARSE_s_n (oEncryptToDefaultKey, "encrypt-to-default-key", "@"),
|
||||
@ -608,7 +609,7 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_i (oChunkSize, "chunk-size", "@"),
|
||||
|
||||
ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
|
||||
ARGPARSE_s_n (oQuiet, "quiet", "@"),
|
||||
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
||||
ARGPARSE_s_n (oNoTTY, "no-tty", "@"),
|
||||
|
||||
ARGPARSE_s_n (oForceAEAD, "force-aead", "@"),
|
||||
@ -625,9 +626,10 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_s (oPrimaryKeyring, "primary-keyring", "@"),
|
||||
ARGPARSE_s_s (oSecretKeyring, "secret-keyring", "@"),
|
||||
ARGPARSE_s_n (oShowKeyring, "show-keyring", "@"),
|
||||
ARGPARSE_s_s (oDefaultKey, "default-key", "@"),
|
||||
ARGPARSE_s_s (oDefaultKey, "default-key",
|
||||
N_("|NAME|use NAME as default secret key")),
|
||||
|
||||
ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
|
||||
ARGPARSE_s_s (oKeyServer, "keyserver", "@"), /* Deprecated. */
|
||||
ARGPARSE_s_s (oKeyServerOptions, "keyserver-options", "@"),
|
||||
ARGPARSE_s_s (oKeyOrigin, "key-origin", "@"),
|
||||
ARGPARSE_s_s (oImportOptions, "import-options", "@"),
|
||||
@ -639,7 +641,7 @@ static gpgrt_opt_t opts[] = {
|
||||
|
||||
ARGPARSE_s_s (oDisplayCharset, "display-charset", "@"),
|
||||
ARGPARSE_s_s (oDisplayCharset, "charset", "@"),
|
||||
ARGPARSE_conffile (oOptions, "options", "@"),
|
||||
ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
|
||||
|
||||
ARGPARSE_s_s (oDebug, "debug", "@"),
|
||||
ARGPARSE_s_s (oDebugLevel, "debug-level", "@"),
|
||||
@ -790,7 +792,8 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"),
|
||||
ARGPARSE_s_n (oLockNever, "lock-never", "@"),
|
||||
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
|
||||
ARGPARSE_s_s (oLoggerFile, "log-file", "@"),
|
||||
ARGPARSE_s_s (oLoggerFile, "log-file",
|
||||
N_("|FILE|write server mode logs to FILE")),
|
||||
ARGPARSE_s_s (oLoggerFile, "logger-file", "@"), /* 1.4 compatibility. */
|
||||
ARGPARSE_s_n (oUseEmbeddedFilename, "use-embedded-filename", "@"),
|
||||
ARGPARSE_s_n (oNoUseEmbeddedFilename, "no-use-embedded-filename", "@"),
|
||||
@ -858,14 +861,16 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
|
||||
ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"),
|
||||
ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
|
||||
ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"),
|
||||
ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr",
|
||||
N_("disable all access to the dirmngr")),
|
||||
ARGPARSE_s_s (oDisplay, "display", "@"),
|
||||
ARGPARSE_s_s (oTTYname, "ttyname", "@"),
|
||||
ARGPARSE_s_s (oTTYtype, "ttytype", "@"),
|
||||
ARGPARSE_s_s (oLCctype, "lc-ctype", "@"),
|
||||
ARGPARSE_s_s (oLCmessages, "lc-messages","@"),
|
||||
ARGPARSE_s_s (oXauthority, "xauthority", "@"),
|
||||
ARGPARSE_s_s (oGroup, "group", "@"),
|
||||
ARGPARSE_s_s (oGroup, "group",
|
||||
N_("|SPEC|set up email aliases")),
|
||||
ARGPARSE_s_s (oUnGroup, "ungroup", "@"),
|
||||
ARGPARSE_s_n (oNoGroups, "no-groups", "@"),
|
||||
ARGPARSE_s_n (oStrict, "strict", "@"),
|
||||
@ -899,7 +904,8 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_n (oNoRequireCrossCert, "no-require-cross-certification", "@"),
|
||||
|
||||
/* New options. Fixme: Should go more to the top. */
|
||||
ARGPARSE_s_s (oAutoKeyLocate, "auto-key-locate", "@"),
|
||||
ARGPARSE_s_s (oAutoKeyLocate, "auto-key-locate",
|
||||
N_("|MECHANISMS|use MECHANISMS to locate keys by mail address")),
|
||||
ARGPARSE_s_n (oNoAutoKeyLocate, "no-auto-key-locate", "@"),
|
||||
ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
|
||||
ARGPARSE_s_n (oNoSymkeyCache, "no-symkey-cache", "@"),
|
||||
|
@ -1,6 +1,7 @@
|
||||
/* scdaemon.c - The GnuPG Smartcard Daemon
|
||||
* Copyright (C) 2001-2002, 2004-2005, 2007-2009 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2001-2002, 2004-2005, 2007-2014 Werner Koch
|
||||
* Copyright (C) 2001-2002, 2004-2005, 2007-2020 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2001-2002, 2004-2005, 2007-2019 Werner Koch
|
||||
* Copyright (C) 2020 g10 Code GmbH
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
|
14
sm/gpgsm.c
14
sm/gpgsm.c
@ -258,7 +258,8 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_n (oArmor, "armour", "@"),
|
||||
ARGPARSE_s_n (oBase64, "base64", N_("create base-64 encoded output")),
|
||||
|
||||
ARGPARSE_s_s (oP12Charset, "p12-charset", "@"),
|
||||
ARGPARSE_s_s (oP12Charset, "p12-charset",
|
||||
N_("|NAME|use encoding NAME for PKCS#12 passphrases")),
|
||||
|
||||
ARGPARSE_s_i (oPassphraseFD, "passphrase-fd", "@"),
|
||||
ARGPARSE_s_s (oPinentryMode, "pinentry-mode", "@"),
|
||||
@ -279,7 +280,8 @@ static gpgrt_opt_t opts[] = {
|
||||
N_("never consult a CRL")),
|
||||
ARGPARSE_s_n (oEnableCRLChecks, "enable-crl-checks", "@"),
|
||||
ARGPARSE_s_n (oDisableTrustedCertCRLCheck,
|
||||
"disable-trusted-cert-crl-check", "@"),
|
||||
"disable-trusted-cert-crl-check",
|
||||
N_("do not check CRLs for root certificates")),
|
||||
ARGPARSE_s_n (oEnableTrustedCertCRLCheck,
|
||||
"enable-trusted-cert-crl-check", "@"),
|
||||
|
||||
@ -303,7 +305,8 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_n (oAutoIssuerKeyRetrieve, "auto-issuer-key-retrieve",
|
||||
N_("fetch missing issuer certificates")),
|
||||
|
||||
ARGPARSE_s_s (oEncryptTo, "encrypt-to", "@"),
|
||||
ARGPARSE_s_s (oEncryptTo, "encrypt-to",
|
||||
N_("|NAME|encrypt to user ID NAME as well")),
|
||||
ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
|
||||
|
||||
ARGPARSE_s_s (oUser, "local-user",
|
||||
@ -314,7 +317,7 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
||||
ARGPARSE_s_n (oNoTTY, "no-tty", N_("don't use the terminal at all")),
|
||||
ARGPARSE_s_s (oLogFile, "log-file",
|
||||
N_("|FILE|write a server mode log to FILE")),
|
||||
N_("|FILE|write server mode logs to FILE")),
|
||||
ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
|
||||
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
|
||||
|
||||
@ -387,7 +390,8 @@ static gpgrt_opt_t opts[] = {
|
||||
ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
|
||||
ARGPARSE_s_s (oXauthority, "xauthority", "@"),
|
||||
ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
|
||||
ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"),
|
||||
ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr",
|
||||
N_("disable all access to the dirmngr")),
|
||||
ARGPARSE_s_s (oProtectToolProgram, "protect-tool-program", "@"),
|
||||
ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
|
||||
ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
|
||||
|
@ -482,10 +482,10 @@ static gc_option_t gc_options_gpg_agent[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the diagnostic output") },
|
||||
{ "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "verbose",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "quiet", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "be somewhat more quiet",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -495,20 +495,20 @@ static gc_option_t gc_options_gpg_agent[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the configuration") },
|
||||
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", "|FILE|read options from FILE",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
|
||||
{ "disable-scdaemon", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "do not use the SCdaemon",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "enable-ssh-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "enable ssh support",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "ssh-fingerprint-digest",
|
||||
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
|
||||
"gnupg", "|ALGO|use ALGO to show ssh fingerprints",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG_AGENT },
|
||||
{ "enable-putty-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "enable putty support",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "enable-extended-key-format", GC_OPT_FLAG_RUNTIME, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -518,10 +518,10 @@ static gc_option_t gc_options_gpg_agent[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Options useful for debugging") },
|
||||
{ "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|LEVEL|set the debugging level to LEVEL",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG_AGENT },
|
||||
{ "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|FILE|write server mode logs to FILE"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
|
||||
{ "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -531,71 +531,61 @@ static gc_option_t gc_options_gpg_agent[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the security") },
|
||||
{ "default-cache-ttl", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_BASIC, "gnupg",
|
||||
"|N|expire cached PINs after N seconds",
|
||||
GC_LEVEL_BASIC, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "default-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_ADVANCED, "gnupg",
|
||||
N_("|N|expire SSH keys after N seconds"),
|
||||
GC_LEVEL_ADVANCED, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "max-cache-ttl", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg",
|
||||
N_("|N|set maximum PIN cache lifetime to N seconds"),
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "max-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg",
|
||||
N_("|N|set maximum SSH key lifetime to N seconds"),
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_BASIC, "gnupg", "do not use the PIN cache when signing",
|
||||
GC_LEVEL_BASIC, "gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "allow-emacs-pinentry", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_ADVANCED,
|
||||
"gnupg", "allow passphrase to be prompted through Emacs",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "no-allow-external-cache", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_BASIC, "gnupg", "disallow the use of an external password cache",
|
||||
GC_LEVEL_BASIC, "gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_ADVANCED, "gnupg", "disallow clients to mark keys as \"trusted\"",
|
||||
GC_LEVEL_ADVANCED, "gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "no-allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg", "disallow caller to override the pinentry",
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
|
||||
{ "Passphrase policy",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Options enforcing a passphrase policy") },
|
||||
{ "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg",
|
||||
N_("do not allow bypassing the passphrase policy"),
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "min-passphrase-len", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_ADVANCED, "gnupg",
|
||||
N_("|N|set minimal required length for new passphrases to N"),
|
||||
GC_LEVEL_ADVANCED, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "min-passphrase-nonalpha", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg",
|
||||
N_("|N|require at least N non-alpha characters for a new passphrase"),
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "check-passphrase-pattern", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("|FILE|check new passphrases against pattern in FILE"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
|
||||
{ "max-passphrase-days", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg",
|
||||
N_("|N|expire the passphrase after N days"),
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
{ "enable-passphrase-history", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_EXPERT, "gnupg",
|
||||
N_("do not allow the reuse of old passphrases"),
|
||||
GC_LEVEL_EXPERT, "gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||
{ "pinentry-timeout", GC_OPT_FLAG_RUNTIME,
|
||||
GC_LEVEL_ADVANCED, "gnupg",
|
||||
N_("|N|set the Pinentry timeout to N seconds"),
|
||||
GC_LEVEL_ADVANCED, "gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
|
||||
|
||||
GC_OPTION_NULL
|
||||
@ -618,10 +608,10 @@ static gc_option_t gc_options_scdaemon[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the diagnostic output") },
|
||||
{ "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "verbose",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
|
||||
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "be somewhat more quiet",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
|
||||
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -631,50 +621,50 @@ static gc_option_t gc_options_scdaemon[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("Options controlling the configuration") },
|
||||
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", "|FILE|read options from FILE",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON },
|
||||
{ "reader-port", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "|N|connect to reader at port N",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
|
||||
{ "ctapi-driver", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|NAME|use NAME as ct-API driver",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
|
||||
{ "pcsc-driver", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|NAME|use NAME as PC/SC driver",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
|
||||
{ "disable-ccid", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
|
||||
"gnupg", "do not use the internal CCID driver",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
|
||||
{ "disable-pinpad", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "do not use a reader's pinpad",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
|
||||
{ "enable-pinpad-varlen",
|
||||
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "use variable length input for pinpad",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
|
||||
{ "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "|N|disconnect the card after N seconds of inactivity",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },
|
||||
{ "application-priority",
|
||||
GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|LIST|Change the application priority to LIST",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
|
||||
|
||||
{ "Debug",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Options useful for debugging") },
|
||||
{ "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|LEVEL|set the debugging level to LEVEL",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
|
||||
{ "log-file", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|FILE|write a log to FILE"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON },
|
||||
|
||||
{ "Security",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the security") },
|
||||
{ "deny-admin", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
|
||||
"gnupg", "deny the use of admin card commands",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
|
||||
|
||||
|
||||
@ -697,10 +687,10 @@ static gc_option_t gc_options_gpg[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the diagnostic output") },
|
||||
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
|
||||
"gnupg", "verbose",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
|
||||
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "be somewhat more quiet",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
|
||||
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -710,13 +700,13 @@ static gc_option_t gc_options_gpg[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("Options controlling the configuration") },
|
||||
{ "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("|NAME|use NAME as default secret key"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
|
||||
{ "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("|NAME|encrypt to user ID NAME as well"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
|
||||
{ "group", GC_OPT_FLAG_LIST, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|SPEC|set up email aliases"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_ALIAS_LIST, GC_BACKEND_GPG },
|
||||
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -741,10 +731,10 @@ static gc_option_t gc_options_gpg[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Options useful for debugging") },
|
||||
{ "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|LEVEL|set the debugging level to LEVEL",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
|
||||
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|FILE|write server mode logs to FILE"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG },
|
||||
/* { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, */
|
||||
/* NULL, NULL, */
|
||||
@ -753,21 +743,15 @@ static gc_option_t gc_options_gpg[] =
|
||||
{ "Keyserver",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Configuration for Keyservers") },
|
||||
{ "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("|URL|use keyserver at URL"), /* Deprecated - use dirmngr */
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
|
||||
{ "allow-pka-lookup", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("allow PKA lookups (DNS requests)"),
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
|
||||
{ "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|MECHANISMS|use MECHANISMS to locate keys by mail address"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
|
||||
{ "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
|
||||
{ "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
|
||||
{ "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("disable all access to the dirmngr"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
|
||||
{ "max-cert-depth",
|
||||
GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
@ -803,10 +787,10 @@ static gc_option_t gc_options_gpgsm[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the diagnostic output") },
|
||||
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
|
||||
"gnupg", "verbose",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "be somewhat more quiet",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -816,25 +800,22 @@ static gc_option_t gc_options_gpgsm[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("Options controlling the configuration") },
|
||||
{ "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("|NAME|use NAME as default secret key"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
|
||||
{ "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("|NAME|encrypt to user ID NAME as well"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
|
||||
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", "|FILE|read options from FILE",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPGSM },
|
||||
{ "prefer-system-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "use system's dirmngr if available",
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("disable all access to the dirmngr"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|NAME|use encoding NAME for PKCS#12 passphrases"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
|
||||
{ "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("|SPEC|use this keyserver to lookup keys"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_GPGSM },
|
||||
{ "default_pubkey_algo",
|
||||
(GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
|
||||
@ -848,10 +829,10 @@ static gc_option_t gc_options_gpgsm[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Options useful for debugging") },
|
||||
{ "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|LEVEL|set the debugging level to LEVEL",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
|
||||
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("|FILE|write server mode logs to FILE"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_GPGSM },
|
||||
{ "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -861,28 +842,28 @@ static gc_option_t gc_options_gpgsm[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the security") },
|
||||
{ "disable-crl-checks", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "never consult a CRL",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "enable-crl-checks", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "disable-trusted-cert-crl-check", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("do not check CRLs for root certificates"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "enable-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "check validity using OCSP",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "include-certs", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"gnupg", "|N|number of certificates to include",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_INT32, GC_BACKEND_GPGSM },
|
||||
{ "disable-policy-checks", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "do not check certificate policies",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "auto-issuer-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", "fetch missing issuer certificates",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
|
||||
{ "cipher-algo", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", "|NAME|use cipher algorithm NAME",
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
|
||||
|
||||
GC_OPTION_NULL
|
||||
@ -905,10 +886,10 @@ static gc_option_t gc_options_dirmngr[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the diagnostic output") },
|
||||
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
|
||||
"dirmngr", "verbose",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "be somewhat more quiet",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -918,17 +899,17 @@ static gc_option_t gc_options_dirmngr[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the format of the output") },
|
||||
{ "sh", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "sh-style command output",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "csh", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "csh-style command output",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
|
||||
{ "Configuration",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
|
||||
"gnupg", N_("Options controlling the configuration") },
|
||||
{ "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
|
||||
"dirmngr", "|FILE|read options from FILE",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
|
||||
{ "resolver-timeout", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -941,13 +922,13 @@ static gc_option_t gc_options_dirmngr[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Options useful for debugging") },
|
||||
{ "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "|LEVEL|set the debugging level to LEVEL",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
|
||||
{ "no-detach", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "do not detach from the console",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", N_("|FILE|write server mode logs to FILE"),
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
|
||||
{ "debug-wait", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
|
||||
NULL, NULL,
|
||||
@ -960,96 +941,96 @@ static gc_option_t gc_options_dirmngr[] =
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the interactivity and enforcement") },
|
||||
{ "batch", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "run without asking a user",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "force", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "force loading of outdated CRLs",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "allow-version-check", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "allow online software version check",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
|
||||
{ "Tor",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Options controlling the use of Tor") },
|
||||
{ "use-tor", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "route all network traffic via Tor",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
|
||||
{ "Keyserver",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Configuration for Keyservers") },
|
||||
{ "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("|URL|use keyserver at URL"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
|
||||
|
||||
{ "HTTP",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Configuration for HTTP servers") },
|
||||
{ "disable-http", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "inhibit the use of HTTP",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "ignore-http-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "ignore HTTP CRL distribution points",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "|URL|redirect all HTTP requests to URL",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
|
||||
{ "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("use system's HTTP proxy setting"),
|
||||
"gnupg", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
|
||||
{ "LDAP",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("Configuration of LDAP servers to use") },
|
||||
{ "disable-ldap", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "inhibit the use of LDAP",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "ignore-ldap-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "ignore LDAP CRL distribution points",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "ldap-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "|HOST|use HOST for LDAP queries",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
|
||||
{ "only-ldap-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "do not use fallback hosts with --ldap-proxy",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "add-servers", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "add new servers discovered in CRL distribution points"
|
||||
" to serverlist", GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "ldaptimeout", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "|N|set LDAP timeout to N seconds",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_DIRMNGR },
|
||||
/* The following entry must not be removed, as it is required for
|
||||
the GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST. */
|
||||
{ "ldapserverlist-file",
|
||||
GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
|
||||
"dirmngr", "|FILE|read LDAP server list from FILE",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
|
||||
/* This entry must come after at least one entry for
|
||||
GC_BACKEND_DIRMNGR in this component, so that the entry for
|
||||
"ldapserverlist-file will be initialized before this one. */
|
||||
{ "LDAP Server", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
|
||||
"gnupg", N_("LDAP server list"),
|
||||
"gnupg", NULL, /* FIXME: Need desc N_("LDAP server list") */
|
||||
GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST },
|
||||
{ "max-replies", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "|N|do not return more than N items in one query",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_UINT32, GC_BACKEND_DIRMNGR },
|
||||
|
||||
{ "OCSP",
|
||||
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
|
||||
"gnupg", N_("Configuration for OCSP") },
|
||||
{ "allow-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
|
||||
"dirmngr", "allow sending OCSP requests",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "ignore-ocsp-service-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "ignore certificate contained OCSP service URLs",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
|
||||
{ "ocsp-responder", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "|URL|use OCSP responder at URL",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
|
||||
{ "ocsp-signer", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
||||
"dirmngr", "|FPR|OCSP response signed by FPR",
|
||||
"dirmngr", NULL,
|
||||
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user