diff options
author | Justus Winter <[email protected]> | 2015-11-16 11:41:46 +0000 |
---|---|---|
committer | Justus Winter <[email protected]> | 2015-11-17 11:50:22 +0000 |
commit | a9e0905342e847e8961ec4fe9b3aaedf05e33423 (patch) | |
tree | 213c99f194fda980f1ea41ad669463d707501e94 /dirmngr | |
parent | gpg: Fix error checking and improve error reporting. (diff) | |
download | gnupg-a9e0905342e847e8961ec4fe9b3aaedf05e33423.tar.gz gnupg-a9e0905342e847e8961ec4fe9b3aaedf05e33423.zip |
Fix typos found using codespell.
* agent/cache.c: Fix typos.
* agent/call-pinentry.c: Likewise.
* agent/call-scd.c: Likewise.
* agent/command-ssh.c: Likewise.
* agent/command.c: Likewise.
* agent/divert-scd.c: Likewise.
* agent/findkey.c: Likewise.
* agent/gpg-agent.c: Likewise.
* agent/w32main.c: Likewise.
* common/argparse.c: Likewise.
* common/audit.c: Likewise.
* common/audit.h: Likewise.
* common/convert.c: Likewise.
* common/dotlock.c: Likewise.
* common/exechelp-posix.c: Likewise.
* common/exechelp-w32.c: Likewise.
* common/exechelp-w32ce.c: Likewise.
* common/exechelp.h: Likewise.
* common/helpfile.c: Likewise.
* common/i18n.h: Likewise.
* common/iobuf.c: Likewise.
* common/iobuf.h: Likewise.
* common/localename.c: Likewise.
* common/logging.c: Likewise.
* common/openpgp-oid.c: Likewise.
* common/session-env.c: Likewise.
* common/sexputil.c: Likewise.
* common/sysutils.c: Likewise.
* common/t-sexputil.c: Likewise.
* common/ttyio.c: Likewise.
* common/util.h: Likewise.
* dirmngr/cdblib.c: Likewise.
* dirmngr/certcache.c: Likewise.
* dirmngr/crlcache.c: Likewise.
* dirmngr/dirmngr-client.c: Likewise.
* dirmngr/dirmngr.c: Likewise.
* dirmngr/dirmngr_ldap.c: Likewise.
* dirmngr/dns-stuff.c: Likewise.
* dirmngr/http.c: Likewise.
* dirmngr/ks-engine-hkp.c: Likewise.
* dirmngr/ks-engine-ldap.c: Likewise.
* dirmngr/ldap-wrapper.c: Likewise.
* dirmngr/ldap.c: Likewise.
* dirmngr/misc.c: Likewise.
* dirmngr/ocsp.c: Likewise.
* dirmngr/validate.c: Likewise.
* g10/encrypt.c: Likewise.
* g10/getkey.c: Likewise.
* g10/gpg.c: Likewise.
* g10/gpgv.c: Likewise.
* g10/import.c: Likewise.
* g10/keydb.c: Likewise.
* g10/keydb.h: Likewise.
* g10/keygen.c: Likewise.
* g10/keyid.c: Likewise.
* g10/keylist.c: Likewise.
* g10/keyring.c: Likewise.
* g10/mainproc.c: Likewise.
* g10/misc.c: Likewise.
* g10/options.h: Likewise.
* g10/packet.h: Likewise.
* g10/parse-packet.c: Likewise.
* g10/pkclist.c: Likewise.
* g10/pkglue.c: Likewise.
* g10/plaintext.c: Likewise.
* g10/server.c: Likewise.
* g10/sig-check.c: Likewise.
* g10/sqlite.c: Likewise.
* g10/tdbio.c: Likewise.
* g10/test-stubs.c: Likewise.
* g10/tofu.c: Likewise.
* g10/trust.c: Likewise.
* g10/trustdb.c: Likewise.
* g13/create.c: Likewise.
* g13/mountinfo.c: Likewise.
* kbx/keybox-blob.c: Likewise.
* kbx/keybox-file.c: Likewise.
* kbx/keybox-init.c: Likewise.
* kbx/keybox-search-desc.h: Likewise.
* kbx/keybox-search.c: Likewise.
* kbx/keybox-update.c: Likewise.
* scd/apdu.c: Likewise.
* scd/app-openpgp.c: Likewise.
* scd/app-p15.c: Likewise.
* scd/app.c: Likewise.
* scd/ccid-driver.c: Likewise.
* scd/command.c: Likewise.
* scd/iso7816.c: Likewise.
* sm/base64.c: Likewise.
* sm/call-agent.c: Likewise.
* sm/call-dirmngr.c: Likewise.
* sm/certchain.c: Likewise.
* sm/gpgsm.c: Likewise.
* sm/import.c: Likewise.
* sm/keydb.c: Likewise.
* sm/minip12.c: Likewise.
* sm/qualified.c: Likewise.
* sm/server.c: Likewise.
* tools/gpg-check-pattern.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgkey2ssh.c: Likewise.
* tools/gpgparsemail.c: Likewise.
* tools/gpgtar.c: Likewise.
* tools/rfc822parse.c: Likewise.
* tools/symcryptrun.c: Likewise.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'dirmngr')
-rw-r--r-- | dirmngr/cdblib.c | 6 | ||||
-rw-r--r-- | dirmngr/certcache.c | 4 | ||||
-rw-r--r-- | dirmngr/crlcache.c | 4 | ||||
-rw-r--r-- | dirmngr/dirmngr-client.c | 2 | ||||
-rw-r--r-- | dirmngr/dirmngr.c | 2 | ||||
-rw-r--r-- | dirmngr/dirmngr_ldap.c | 2 | ||||
-rw-r--r-- | dirmngr/dns-stuff.c | 4 | ||||
-rw-r--r-- | dirmngr/http.c | 2 | ||||
-rw-r--r-- | dirmngr/ks-engine-hkp.c | 2 | ||||
-rw-r--r-- | dirmngr/ks-engine-ldap.c | 6 | ||||
-rw-r--r-- | dirmngr/ldap-wrapper.c | 2 | ||||
-rw-r--r-- | dirmngr/ldap.c | 4 | ||||
-rw-r--r-- | dirmngr/misc.c | 2 | ||||
-rw-r--r-- | dirmngr/ocsp.c | 4 | ||||
-rw-r--r-- | dirmngr/validate.c | 4 |
15 files changed, 25 insertions, 25 deletions
diff --git a/dirmngr/cdblib.c b/dirmngr/cdblib.c index 9636b6ce5..23cb317a5 100644 --- a/dirmngr/cdblib.c +++ b/dirmngr/cdblib.c @@ -696,7 +696,7 @@ make_find (struct cdb_make *cdbmp, { struct cdb_rl *rl = cdbmp->cdb_rec[hval&255]; int r, i; - int seeked = 0; + int sought = 0; while(rl) { for(i = rl->cnt - 1; i >= 0; --i) { /* search backward */ if (rl->rec[i].hval != hval) @@ -711,7 +711,7 @@ make_find (struct cdb_make *cdbmp, return -1; cdbmp->cdb_bpos = cdbmp->cdb_buf; } - seeked = 1; + sought = 1; r = match(cdbmp->cdb_fd, rl->rec[i].rpos, key, klen); if (!r) continue; @@ -725,7 +725,7 @@ make_find (struct cdb_make *cdbmp, } rl = rl->next; } - if (seeked && lseek(cdbmp->cdb_fd, cdbmp->cdb_dpos, SEEK_SET) < 0) + if (sought && lseek(cdbmp->cdb_fd, cdbmp->cdb_dpos, SEEK_SET) < 0) return -1; return 0; } diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index 8c5feeff4..45be1f29f 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -331,7 +331,7 @@ put_cert (ksba_cert_t cert, int is_loaded, int is_trusted, void *fpr_buffer) /* Load certificates from the directory DIRNAME. All certificates matching the pattern "*.crt" or "*.der" are loaded. We assume that certificates are DER encoded and not PEM encapsulated. The cache - should be in a locked state when calling this fucntion. */ + should be in a locked state when calling this function. */ static gpg_error_t load_certs_from_dir (const char *dirname, int are_trusted) { @@ -687,7 +687,7 @@ get_cert_bysubject (const char *subject_dn, unsigned int seq) -/* Return a value decribing the the class of PATTERN. The offset of +/* Return a value describing the the class of PATTERN. The offset of the actual string to be used for the comparison is stored at R_OFFSET. The offset of the serialnumer is stored at R_SN_OFFSET. */ static enum pattern_class diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c index d20599901..6d3f8cef9 100644 --- a/dirmngr/crlcache.c +++ b/dirmngr/crlcache.c @@ -859,7 +859,7 @@ update_dir (crl_cache_t cache) field, thus we can compare it pretty easily. */ *endp = 0; e = find_entry ( cache->entries, fieldp); - *endp = ':'; /* Restore orginal line. */ + *endp = ':'; /* Restore original line. */ if (e && e->deleted) { /* Marked for deletion, so don't write it. */ @@ -1212,7 +1212,7 @@ find_entry (crl_cache_entry_t first, const char *issuer_hash) } -/* Create a new CRL cache. This fucntion is usually called only once. +/* Create a new CRL cache. This function is usually called only once. never fail. */ void crl_cache_init(void) diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c index 29e29b509..8e280f62e 100644 --- a/dirmngr/dirmngr-client.c +++ b/dirmngr/dirmngr-client.c @@ -185,7 +185,7 @@ main (int argc, char **argv ) log_set_prefix ("dirmngr-client", GPGRT_LOG_WITH_PREFIX); - /* For W32 we need to initialize the socket subsystem. Becuase we + /* For W32 we need to initialize the socket subsystem. Because we don't use Pth we need to do this explicit. */ #ifdef HAVE_W32_SYSTEM { diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 8789d818e..ccefc3c06 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1987,7 +1987,7 @@ check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce) } -/* Helper to call a connection's main fucntion. */ +/* Helper to call a connection's main function. */ static void * start_connection_thread (void *arg) { diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index 61a7e390e..6309413ef 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -165,7 +165,7 @@ struct my_opt_s unsigned int alarm_timeout; /* And for the alarm based timeout. */ int multi; - estream_t outstream; /* Send output to thsi stream. */ + estream_t outstream; /* Send output to this stream. */ /* Note that we can't use const for the strings because ldap_* are not defined that way. */ diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c index 200e1e209..2af4dec1c 100644 --- a/dirmngr/dns-stuff.c +++ b/dirmngr/dns-stuff.c @@ -48,7 +48,7 @@ #endif #if !defined(HAVE_GETADDRINFO) && !defined(USE_ADNS) -# error Either getaddrinfo or the ADNS libary is required. +# error Either getaddrinfo or the ADNS library is required. #endif #ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth. */ @@ -511,7 +511,7 @@ resolve_addr_standard (const struct sockaddr *addr, int addrlen, } -/* This a wrapper around getaddrinfo with slighly different semantics. +/* This a wrapper around getaddrinfo with slightly different semantics. NAME is the name to resolve. PORT is the requested port or 0. WANT_FAMILY is either 0 (AF_UNSPEC), AF_INET6, or AF_INET4. diff --git a/dirmngr/http.c b/dirmngr/http.c index 9e2ba90f8..e33a59436 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -267,7 +267,7 @@ struct http_context_s }; -/* The global callback for the verification fucntion. */ +/* The global callback for the verification function. */ static gpg_error_t (*tls_callback) (http_t, http_session_t, int); /* The list of files with trusted CA certificates. */ diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c index a6587271c..c856d6c95 100644 --- a/dirmngr/ks-engine-hkp.c +++ b/dirmngr/ks-engine-hkp.c @@ -101,7 +101,7 @@ struct hostinfo_s static hostinfo_t *hosttable; static int hosttable_size; -/* The number of host slots we initally allocate for HOSTTABLE. */ +/* The number of host slots we initially allocate for HOSTTABLE. */ #define INITIAL_HOSTTABLE_SIZE 10 diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c index 77a2dd00d..ad2110ef1 100644 --- a/dirmngr/ks-engine-ldap.c +++ b/dirmngr/ks-engine-ldap.c @@ -433,10 +433,10 @@ keyspec_to_ldap_filter (const char *keyspec, char **filter, int only_exact) If this function successfully interrogated the server, it returns 0. If there was an LDAP error, it returns the LDAP error code. If - an error occured, *basednp, etc., are undefined (and don't need to + an error occurred, *basednp, etc., are undefined (and don't need to be freed.) - If no LDAP error occured, you still need to check that *basednp is + If no LDAP error occurred, you still need to check that *basednp is valid. If it is NULL, then the server does not appear to be an OpenPGP Keyserver. In this case, you also do not need to xfree *pgpkeyattrp. */ @@ -1616,7 +1616,7 @@ extract_attributes (LDAPMod ***modlist, char *line) fields = strsplit (line, ':', '\0', &field_count); if (field_count == 1) - /* We only have a single field. There is definately nothing to + /* We only have a single field. There is definitely nothing to do. */ goto out; diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c index a54e40523..c073f1710 100644 --- a/dirmngr/ldap-wrapper.c +++ b/dirmngr/ldap-wrapper.c @@ -160,7 +160,7 @@ destroy_wrapper (struct wrapper_context_s *ctx) /* Print the content of LINE to thye log stream but make sure to only print complete lines. Using NULL for LINE will flush any pending - output. LINE may be modified by this fucntion. */ + output. LINE may be modified by this function. */ static void print_log_line (struct wrapper_context_s *ctx, char *line) { diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c index e4c6aa2ff..8a543a41a 100644 --- a/dirmngr/ldap.c +++ b/dirmngr/ldap.c @@ -382,7 +382,7 @@ parse_one_pattern (const char *pattern) return result; } -/* Take the string STRING and escape it accoring to the URL rules. +/* Take the string STRING and escape it according to the URL rules. Retun a newly allocated string. */ static char * escape4url (const char *string) @@ -512,7 +512,7 @@ start_default_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *context, } -/* Prepare an LDAP query to return certificates maching PATTERNS using +/* Prepare an LDAP query to return certificates matching PATTERNS using the SERVER. This function returns an error code or 0 and a CONTEXT on success. */ gpg_error_t diff --git a/dirmngr/misc.c b/dirmngr/misc.c index 244919eb0..c2c5af16a 100644 --- a/dirmngr/misc.c +++ b/dirmngr/misc.c @@ -36,7 +36,7 @@ buffer will be returned. The caller should provide RESULT of at least strlen(STRING)/2 bytes. There is no error detection, the parsing stops at the first non hex character. With RESULT given as - NULL, the fucntion does only return the size of the buffer which + NULL, the function does only return the size of the buffer which would be needed. */ size_t unhexify (unsigned char *result, const char *string) diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c index 392c02b5f..e12340955 100644 --- a/dirmngr/ocsp.c +++ b/dirmngr/ocsp.c @@ -83,7 +83,7 @@ read_response (estream_t fp, unsigned char **r_buffer, size_t *r_buflen) return err; } if ( !(nread == bufsize-nbytes && !es_feof (fp))) - { /* Response succesfully received. */ + { /* Response successfully received. */ nbytes += nread; *r_buffer = buffer; *r_buflen = nbytes; @@ -116,7 +116,7 @@ read_response (estream_t fp, unsigned char **r_buffer, size_t *r_buflen) /* Construct an OCSP request, send it to the configured OCSP responder and parse the response. On success the OCSP context may be used to - further process the reponse. */ + further process the response. */ static gpg_error_t do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md, const char *url, ksba_cert_t cert, ksba_cert_t issuer_cert) diff --git a/dirmngr/validate.c b/dirmngr/validate.c index 574eca656..1a851b6ce 100644 --- a/dirmngr/validate.c +++ b/dirmngr/validate.c @@ -597,7 +597,7 @@ validate_cert_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime, break; /* Okay: a self-signed certicate is an end-point. */ } - /* To avoid loops, we use an arbitary limit on the length of + /* To avoid loops, we use an arbitrary limit on the length of the chain. */ depth++; if (depth > maxdepth) @@ -757,7 +757,7 @@ validate_cert_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime, here because this does not seem to make much sense. This might become a recursive process and we should better cache our validity results to avoid double work. Far worse a - catch-22 may happen for an improper setup hierachy and we + catch-22 may happen for an improper setup hierarchy and we need a way to break up such a deadlock. */ err = check_revocations (ctrl, chain); } |