aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr
diff options
context:
space:
mode:
Diffstat (limited to 'dirmngr')
-rw-r--r--dirmngr/certcache.c2
-rw-r--r--dirmngr/dns-stuff.c2
-rw-r--r--dirmngr/dns-stuff.h2
-rw-r--r--dirmngr/dns.c2
-rw-r--r--dirmngr/http.c8
-rw-r--r--dirmngr/ldap-wrapper.c2
-rw-r--r--dirmngr/loadswdb.c4
-rw-r--r--dirmngr/server.c6
-rw-r--r--dirmngr/validate.c6
9 files changed, 17 insertions, 17 deletions
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c
index c3f3427b1..b4e538131 100644
--- a/dirmngr/certcache.c
+++ b/dirmngr/certcache.c
@@ -97,7 +97,7 @@ static unsigned int total_nonperm_certificates;
#ifdef HAVE_W32_SYSTEM
/* We load some functions dynamically. Provide typedefs for tehse
- * fucntions. */
+ * functions. */
typedef HCERTSTORE (WINAPI *CERTOPENSYSTEMSTORE)
(HCRYPTPROV hProv, LPCSTR szSubsystemProtocol);
typedef PCCERT_CONTEXT (WINAPI *CERTENUMCERTIFICATESINSTORE)
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 06351154f..a6c14cdcd 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -526,7 +526,7 @@ libdns_init (void)
/* No DNS resolution type found in the list. This might be
* due to systemd based systems which allow for custom
* keywords which are not known to us and thus we do not
- * know whether DNS is wanted or not. Becuase DNS is
+ * know whether DNS is wanted or not. Because DNS is
* important for our infrastructure, we forcefully append
* DNS to the end of the list. */
if (strlen (ld.resolv_conf->lookup)+2 < sizeof ld.resolv_conf->lookup)
diff --git a/dirmngr/dns-stuff.h b/dirmngr/dns-stuff.h
index adb0b80b0..612b2e5f5 100644
--- a/dirmngr/dns-stuff.h
+++ b/dirmngr/dns-stuff.h
@@ -154,7 +154,7 @@ int is_onion_address (const char *name);
/* Get the canonical name for NAME. */
gpg_error_t get_dns_cname (const char *name, char **r_cname);
-/* Return a CERT record or an arbitray RR. */
+/* Return a CERT record or an arbitrary RR. */
gpg_error_t get_dns_cert (const char *name, int want_certtype,
void **r_key, size_t *r_keylen,
unsigned char **r_fpr, size_t *r_fprlen,
diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index 5b8f14ff8..c660cf527 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -4263,7 +4263,7 @@ size_t dns_txt_print(void *_dst, size_t lim, struct dns_txt *txt) {
/* Some of the function pointers of DNS_RRTYPES are initialized with
- * slighlly different fucntions, thus we can't use prototypes. */
+ * slighlly different functions, thus we can't use prototypes. */
DNS_PRAGMA_PUSH
#if __clang__
#pragma clang diagnostic ignored "-Wstrict-prototypes"
diff --git a/dirmngr/http.c b/dirmngr/http.c
index e74d051ec..f461e5da3 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -31,7 +31,7 @@
*/
/* Simple HTTP client implementation. We try to keep the code as
- self-contained as possible. There are some contraints however:
+ self-contained as possible. There are some constraints however:
- estream is required. We now require estream because it provides a
very useful and portable asprintf implementation and the fopencookie
@@ -1347,7 +1347,7 @@ do_parse_uri (parsed_uri_t uri, int only_local_part,
if ((n = remove_escapes (uri->host)) < 0)
return GPG_ERR_BAD_URI;
if (n != strlen (uri->host))
- return GPG_ERR_BAD_URI; /* Hostname incudes a Nul. */
+ return GPG_ERR_BAD_URI; /* Hostname includes a Nul. */
p = p2 ? p2 : NULL;
}
else if (uri->is_http)
@@ -2185,7 +2185,7 @@ store_header (http_t hd, char *line)
if (*line == ' ' || *line == '\t')
{
/* Continuation. This won't happen too often as it is not
- recommended. We use a straightforward implementaion. */
+ recommended. We use a straightforward implementation. */
if (!hd->headers)
return GPG_ERR_PROTOCOL_VIOLATION;
n += strlen (hd->headers->value);
@@ -2468,7 +2468,7 @@ start_server ()
/* Return true if SOCKS shall be used. This is the case if tor_mode
* is enabled and the desired address is not the loopback address.
- * This function is basically a copy of the same internal fucntion in
+ * This function is basically a copy of the same internal function in
* Libassuan. */
static int
use_socks (struct sockaddr_storage *addr)
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index ac4964a55..8b53bd60f 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -107,7 +107,7 @@ struct wrapper_context_s
-/* We keep a global list of spawed wrapper process. A separate thread
+/* We keep a global list of spawned wrapper process. A separate thread
makes use of this list to log error messages and to watch out for
finished processes. */
static struct wrapper_context_s *wrapper_list;
diff --git a/dirmngr/loadswdb.c b/dirmngr/loadswdb.c
index 5a7778ddd..7791f68ee 100644
--- a/dirmngr/loadswdb.c
+++ b/dirmngr/loadswdb.c
@@ -32,7 +32,7 @@
/* Get the time from the current swdb file and store it at R_FILEDATE
* and R_VERIFIED. If the file does not exist 0 is stored at there.
- * The function returns 0 on sucess or an error code. */
+ * The function returns 0 on success or an error code. */
static gpg_error_t
time_of_saved_swdb (const char *fname, time_t *r_filedate, time_t *r_verified)
{
@@ -59,7 +59,7 @@ time_of_saved_swdb (const char *fname, time_t *r_filedate, time_t *r_verified)
goto leave;
}
- /* Note that the parser uses the first occurance of a matching
+ /* Note that the parser uses the first occurrence of a matching
* values and ignores possible duplicated values. */
maxlen = 2048; /* Set limit. */
while ((len = es_read_line (fp, &line, &length_of_line, &maxlen)) > 0)
diff --git a/dirmngr/server.c b/dirmngr/server.c
index f4aeadbc4..237cb5278 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1413,7 +1413,7 @@ lookup_cert_by_pattern (assuan_context_t ctx, char *line,
}
}
- /* First look through the internal cache. The certifcates returned
+ /* First look through the internal cache. The certificates returned
here are not counted towards the truncation limit. */
if (single && !cache_only)
; /* Do not read from the local cache in this case. */
@@ -1940,7 +1940,7 @@ ensure_keyserver (ctrl_t ctrl)
}
}
- /* Decide which to use. Note that the sesssion has no keyservers
+ /* Decide which to use. Note that the session has no keyservers
yet set. */
if (onion_items && !onion_items->next && plain_items && !plain_items->next)
{
@@ -2328,7 +2328,7 @@ cmd_ks_put (assuan_context_t ctx, char *line)
}
/* Ask for the key meta data. Not actually needed for HKP servers
- but we do it anyway to test the client implementaion. */
+ but we do it anyway to test the client implementation. */
err = assuan_inquire (ctx, "KEYBLOCK_INFO",
&info, &infolen, MAX_KEYBLOCK_LENGTH);
if (err)
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 3671a8b9e..371852ba7 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -147,7 +147,7 @@ unknown_criticals (ksba_cert_t cert)
}
}
if (err && gpg_err_code (err) != GPG_ERR_EOF)
- rc = err; /* Such an error takes precendence. */
+ rc = err; /* Such an error takes precedence. */
return rc;
}
@@ -344,7 +344,7 @@ is_root_cert (ksba_cert_t cert, const char *issuerdn, const char *subjectdn)
{
if (gpg_err_code (err) == GPG_ERR_NO_DATA)
return 1; /* Yes. Without a authorityKeyIdentifier this needs
- to be the Root certifcate (our trust anchor). */
+ to be the Root certificate (our trust anchor). */
log_error ("error getting authorityKeyIdentifier: %s\n",
gpg_strerror (err));
return 0; /* Well, it is broken anyway. Return No. */
@@ -619,7 +619,7 @@ validate_cert_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
log_info ("root certificate is good and trusted\n");
}
- break; /* Okay: a self-signed certicate is an end-point. */
+ break; /* Okay: a self-signed certificate is an end-point. */
}
/* To avoid loops, we use an arbitrary limit on the length of