aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr
diff options
context:
space:
mode:
Diffstat (limited to 'dirmngr')
-rw-r--r--dirmngr/crlfetch.c16
-rw-r--r--dirmngr/dirmngr.c6
-rw-r--r--dirmngr/dirmngr.h2
-rw-r--r--dirmngr/dns-stuff.c2
-rw-r--r--dirmngr/http.c4
-rw-r--r--dirmngr/ks-engine-ldap.c12
-rw-r--r--dirmngr/ocsp.c4
-rw-r--r--dirmngr/server.c8
8 files changed, 27 insertions, 27 deletions
diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c
index 0f34e2794..7e814f53b 100644
--- a/dirmngr/crlfetch.c
+++ b/dirmngr/crlfetch.c
@@ -292,8 +292,8 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader)
}
else if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("CRL access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("CRL access not possible due to Tor mode\n"));
err = gpg_error (GPG_ERR_NOT_SUPPORTED);
}
else
@@ -318,8 +318,8 @@ crl_fetch_default (ctrl_t ctrl, const char *issuer, ksba_reader_t *reader)
{
if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("CRL access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("CRL access not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
if (opt.disable_ldap)
@@ -350,8 +350,8 @@ ca_cert_fetch (ctrl_t ctrl, cert_fetch_context_t *context, const char *dn)
{
if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("CRL access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("CRL access not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
if (opt.disable_ldap)
@@ -377,8 +377,8 @@ start_cert_fetch (ctrl_t ctrl, cert_fetch_context_t *context,
{
if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("CRL access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("CRL access not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
if (opt.disable_ldap)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 9aa1ca3d9..d6c1670cd 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -218,7 +218,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
- ARGPARSE_s_n (oUseTor, "use-tor", N_("route all network traffic via TOR")),
+ ARGPARSE_s_n (oUseTor, "use-tor", N_("route all network traffic via Tor")),
ARGPARSE_s_s (oSocketName, "socket-name", "@"), /* Only for debugging. */
@@ -474,7 +474,7 @@ set_tor_mode (void)
if (assuan_sock_set_flag (ASSUAN_INVALID_FD, "tor-mode", 1))
#endif
{
- log_error ("error enabling TOR mode: %s\n", strerror (errno));
+ log_error ("error enabling Tor mode: %s\n", strerror (errno));
log_info ("(is your Libassuan recent enough?)\n");
}
}
@@ -1001,7 +1001,7 @@ main (int argc, char **argv)
if (opt.use_tor)
{
log_info ("WARNING: ***************************************\n");
- log_info ("WARNING: TOR mode (--use-tor) MAY NOT FULLY WORK!\n");
+ log_info ("WARNING: Tor mode (--use-tor) MAY NOT FULLY WORK!\n");
log_info ("WARNING: ***************************************\n");
}
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index dff902aa5..b2b14cc4f 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -93,7 +93,7 @@ struct
int system_service; /* We are running as W32 service (implies daemon). */
int system_daemon; /* We are running in system daemon mode. */
int running_detached; /* We are running in detached mode. */
- int use_tor; /* TOR mode has been enabled. */
+ int use_tor; /* Tor mode has been enabled. */
int force; /* Force loading outdated CRLs. */
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index ba4ab8fd0..00d2b3ee1 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -62,7 +62,7 @@
/* If set Tor mode shall be used. */
static int tor_mode;
-/* Sets the module in TOR mode. Returns 0 is this is possible or an
+/* Sets the module in Tor mode. Returns 0 is this is possible or an
error code. */
gpg_error_t
enable_dns_tormode (void)
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 1365ea109..90dfc08be 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -757,7 +757,7 @@ http_raw_connect (http_t *r_hd, const char *server, unsigned short port,
if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
#endif
{
- log_error ("TOR support is not available\n");
+ log_error ("Tor support is not available\n");
return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);
}
}
@@ -1479,7 +1479,7 @@ send_request (http_t hd, const char *httphost, const char *auth,
if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
#endif
{
- log_error ("TOR support is not available\n");
+ log_error ("Tor support is not available\n");
return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);
}
}
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index c6fa5ebc3..77a2dd00d 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -838,8 +838,8 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("LDAP access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("LDAP access not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
@@ -1021,8 +1021,8 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("LDAP access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("LDAP access not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
@@ -1897,8 +1897,8 @@ ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
if (opt.use_tor)
{
- /* For now we do not support LDAP over TOR. */
- log_error (_("LDAP access not possible due to TOR mode\n"));
+ /* For now we do not support LDAP over Tor. */
+ log_error (_("LDAP access not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c
index f81f3358e..392c02b5f 100644
--- a/dirmngr/ocsp.c
+++ b/dirmngr/ocsp.c
@@ -134,9 +134,9 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
if (opt.use_tor)
{
- /* For now we do not allow OCSP via TOR due to possible privacy
+ /* For now we do not allow OCSP via Tor due to possible privacy
concerns. Needs further research. */
- log_error (_("OCSP request not possible due to TOR mode\n"));
+ log_error (_("OCSP request not possible due to Tor mode\n"));
return gpg_error (GPG_ERR_NOT_SUPPORTED);
}
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 23ecdd8b9..a41d34f03 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -628,7 +628,7 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
}
else if (!strcmp (key, "honor-keyserver-url-used"))
{
- /* Return an error if we are running in TOR mode. */
+ /* Return an error if we are running in Tor mode. */
if (opt.use_tor)
err = gpg_error (GPG_ERR_FORBIDDEN);
}
@@ -715,7 +715,7 @@ cmd_dns_cert (assuan_context_t ctx, char *line)
if (opt.use_tor && enable_dns_tormode ())
{
- /* TOR mode is requested but the DNS code can't enable it. */
+ /* Tor mode is requested but the DNS code can't enable it. */
err = gpg_error (GPG_ERR_FORBIDDEN);
goto leave;
}
@@ -2087,7 +2087,7 @@ static const char hlp_getinfo[] =
"\n"
"version - Return the version of the program.\n"
"pid - Return the process id of the server.\n"
- "tor - Return OK if running in TOR mode\n"
+ "tor - Return OK if running in Tor mode\n"
"socket_name - Return the name of the socket.\n";
static gpg_error_t
cmd_getinfo (assuan_context_t ctx, char *line)
@@ -2120,7 +2120,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
}
else if (!strcmp (line, "tor"))
{
- err = opt.use_tor? 0:set_error (GPG_ERR_GENERAL, "TOR mode not enabled");
+ err = opt.use_tor? 0:set_error (GPG_ERR_GENERAL, "Tor mode not enabled");
}
else
err = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 02:48:01 +0000