From 42b0e9558a308dbc954ee60c3d346b5cabcd2fdb Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sun, 12 May 2024 18:09:23 -0400 Subject: [PATCH] indent: Fix spelling -- These are non-substantive corrections for minor spelling mistakes within the GnuPG codebase. With something like this applied to the codebase, and a judiciously tuned spellchecker integrated as part of a standard test suite, it should be possible to keep a uniform orthography within the project. GnuPG-bug-id: 7116 --- agent/agent.h | 4 ++-- agent/call-pinentry.c | 2 +- agent/command.c | 2 +- agent/divert-scd.c | 2 +- agent/findkey.c | 2 +- agent/gpg-agent.c | 4 ++-- agent/protect.c | 2 +- agent/sexp-secret.c | 2 +- agent/trustlist.c | 4 ++-- build-aux/speedo.mk | 6 +++--- build-aux/speedo/w32/README.txt | 2 +- build-aux/speedo/w32/g4wihelp.c | 2 +- common/asshelp.c | 2 +- common/audit.c | 2 +- common/audit.h | 2 +- common/compliance.c | 2 +- common/dotlock.c | 2 +- common/gettime.c | 2 +- common/homedir.c | 4 ++-- common/iobuf.c | 2 +- common/iobuf.h | 2 +- common/mkdir_p.h | 2 +- common/openpgp-fpr.c | 2 +- common/openpgp-oid.c | 2 +- common/session-env.c | 4 ++-- common/sexp-parse.h | 2 +- common/sexputil.c | 4 ++-- common/sysutils.c | 4 ++-- common/t-iobuf.c | 2 +- common/tlv-builder.c | 2 +- common/tlv-parser.c | 2 +- common/tlv.h | 2 +- common/util.h | 2 +- configure.ac | 4 ++-- dirmngr/ONEWS | 4 ++-- dirmngr/certcache.c | 2 +- dirmngr/dirmngr.c | 6 +++--- dirmngr/dirmngr.h | 2 +- dirmngr/dns.c | 2 +- dirmngr/http-ntbtls.c | 2 +- dirmngr/http.c | 16 ++++++++-------- dirmngr/ks-engine-ldap.c | 14 +++++++------- dirmngr/ldap-misc.c | 2 +- dirmngr/ldap.c | 8 ++++---- dirmngr/ldapserver.c | 2 +- dirmngr/ocsp.c | 8 ++++---- dirmngr/server.c | 2 +- dirmngr/t-ldap-parse-uri.c | 2 +- dirmngr/validate.c | 6 +++--- doc/DETAILS | 14 +++++++------- doc/HACKING | 4 ++-- doc/dirmngr.texi | 2 +- doc/examples/common.conf | 4 ++-- doc/examples/trustlist.txt | 2 +- doc/gnupg.texi | 2 +- doc/gpg-card.texi | 2 +- doc/gpg.texi | 6 +++--- doc/help.txt | 2 +- doc/ldap/README.ldap | 8 ++++---- doc/ldap/gnupg-ldap-ad-schema.ldif | 4 ++-- doc/ldap/gnupg-ldap-schema.ldif | 4 ++-- doc/tools.texi | 2 +- g10/armor.c | 4 ++-- g10/call-agent.c | 6 +++--- g10/call-dirmngr.c | 2 +- g10/call-keyboxd.c | 4 ++-- g10/card-util.c | 2 +- g10/encrypt.c | 6 +++--- g10/export.c | 2 +- g10/getkey.c | 6 +++--- g10/gpg.c | 6 +++--- g10/import.c | 2 +- g10/key-clean.c | 2 +- g10/keyedit.c | 6 +++--- g10/keygen.c | 4 ++-- g10/keyid.c | 6 +++--- g10/options.h | 2 +- g10/packet.h | 2 +- g10/pkclist.c | 2 +- g10/pkglue.c | 2 +- g10/sig-check.c | 2 +- g10/sign.c | 4 ++-- g10/tofu.c | 2 +- g10/trustdb.c | 2 +- g13/g13-syshelp.c | 2 +- g13/g13.c | 4 ++-- g13/sh-dmcrypt.c | 2 +- kbx/backend-sqlite.c | 2 +- kbx/backend-support.c | 4 ++-- kbx/frontend.c | 2 +- kbx/kbxserver.c | 2 +- kbx/keybox-init.c | 2 +- kbx/keybox-search-desc.h | 2 +- kbx/keyboxd.c | 2 +- m4/gpg-error.m4 | 2 +- m4/ksba.m4 | 4 ++-- m4/ntbtls.m4 | 4 ++-- regexp/jimregexp.c | 2 +- scd/apdu.c | 2 +- scd/app-nks.c | 2 +- scd/app-openpgp.c | 2 +- scd/app-p15.c | 10 +++++----- scd/app-piv.c | 4 ++-- scd/app.c | 2 +- scd/ccid-driver.c | 2 +- scd/command.c | 4 ++-- scd/iso7816.c | 4 ++-- scd/scdaemon.c | 4 ++-- sm/call-agent.c | 2 +- sm/certchain.c | 2 +- sm/certreqgen.c | 4 ++-- sm/decrypt.c | 4 ++-- sm/export.c | 4 ++-- sm/gpgsm.c | 6 +++--- sm/gpgsm.h | 2 +- sm/import.c | 2 +- sm/keydb.c | 6 +++--- sm/keylist.c | 2 +- sm/minip12.c | 4 ++-- sm/misc.c | 2 +- tests/asschk.c | 4 ++-- tests/openpgp/all-tests.scm | 2 +- tests/openpgp/defs.scm | 2 +- tests/openpgp/fake-pinentry.c | 2 +- tests/tpm2dtests/all-tests.scm | 2 +- tools/call-dirmngr.c | 2 +- tools/card-yubikey.c | 2 +- tools/gpg-authcode-sign.sh | 4 ++-- tools/gpg-card.c | 2 +- tools/gpg-check-pattern.c | 2 +- tools/gpgconf-comp.c | 12 ++++++------ tools/gpgconf.c | 2 +- tools/gpgtar-list.c | 8 ++++---- tools/gpgtar.c | 2 +- tpm2d/Makefile.am | 2 +- tpm2d/tpm2daemon.c | 6 +++--- 136 files changed, 233 insertions(+), 233 deletions(-) diff --git a/agent/agent.h b/agent/agent.h index dbb3000dd..7ffbd5cc2 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -121,7 +121,7 @@ struct /* Flag disallowing bypassing of the warning. */ int enforce_passphrase_constraints; - /* The require minmum length of a passphrase. */ + /* The required minimum length of a passphrase. */ unsigned int min_passphrase_len; /* The minimum number of non-alpha characters in a passphrase. */ @@ -286,7 +286,7 @@ struct server_control_s int algo; unsigned char value[MAX_DIGEST_LEN]; unsigned int raw_value: 1; - unsigned int is_pss: 1; /* DATA holds PSS formated data. */ + unsigned int is_pss: 1; /* DATA holds PSS formatted data. */ } digest; unsigned int have_keygrip: 1; unsigned int have_keygrip1: 1; diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index 4a999ca9a..ba37a775e 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -884,7 +884,7 @@ struct inq_cb_parm_s }; -/* Return true if PIN is indentical to the last generated pin. */ +/* Return true if PIN is identical to the last generated pin. */ static int is_generated_pin (struct inq_cb_parm_s *parm, const char *pin) { diff --git a/agent/command.c b/agent/command.c index 417a8815f..3012680a1 100644 --- a/agent/command.c +++ b/agent/command.c @@ -251,7 +251,7 @@ reset_notify (assuan_context_t ctx, char *line) clear_nonce_cache (ctrl); - /* Note that a RESET does not clear the ephemeral store becuase + /* Note that a RESET does not clear the ephemeral store because * clients are used to issue a RESET on a connection. */ return 0; diff --git a/agent/divert-scd.c b/agent/divert-scd.c index d8c2bcca7..d390ebb06 100644 --- a/agent/divert-scd.c +++ b/agent/divert-scd.c @@ -90,7 +90,7 @@ has_percent0A_suffix (const char *string) INFO gets displayed as part of a generic string. However if the first character of INFO is a vertical bar all up to the next - verical bar are considered flags and only everything after the + vertical bar are considered flags and only everything after the second vertical bar gets displayed as the full prompt. Flags: diff --git a/agent/findkey.c b/agent/findkey.c index 1f2938ea3..c0cbce7a2 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -1550,7 +1550,7 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce, { memcpy (*shadow_info, s, n); /* - * When it's a key on card (not on tpm2), maks sure + * When it's a key on card (not on tpm2), make sure * it's available. */ if (strcmp (shadow_type, "t1-v1") == 0 && !grip) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 3c71ba65d..3e1fb5d5b 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1216,7 +1216,7 @@ main (int argc, char **argv) * Now we are now working under our real uid */ - /* The configuraton directories for use by gpgrt_argparser. */ + /* The configuration directories for use by gpgrt_argparser. */ gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ()); gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ()); @@ -1225,7 +1225,7 @@ main (int argc, char **argv) pargs.argc = &argc; pargs.argv = &argv; /* We are re-using the struct, thus the reset flag. We OR the - * flags so that the internal intialized flag won't be cleared. */ + * flags so that the internal initialized flag won't be cleared. */ pargs.flags |= (ARGPARSE_FLAG_RESET | ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_SYS diff --git a/agent/protect.c b/agent/protect.c index 7197cf7e6..6c9bbaebc 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -509,7 +509,7 @@ do_encryption (const unsigned char *hashbegin, size_t hashlen, ((sha1 salt no_of_iterations) 16byte_iv) encrypted_octet_string) - in canoncical format of course. We use asprintf and %n modifier + in canonical format of course. We use asprintf and %n modifier and dummy values as placeholders. */ { char countbuf[35]; diff --git a/agent/sexp-secret.c b/agent/sexp-secret.c index ac8daa910..661681620 100644 --- a/agent/sexp-secret.c +++ b/agent/sexp-secret.c @@ -22,7 +22,7 @@ #include "../common/sexp-parse.h" /* - * When it's for ECC, fixup private key part in the cannonical SEXP + * When it's for ECC, fixup private key part in the canonical SEXP * representation in BUF. If not ECC, do nothing. */ gpg_error_t diff --git a/agent/trustlist.c b/agent/trustlist.c index fce23de15..a37705b8e 100644 --- a/agent/trustlist.c +++ b/agent/trustlist.c @@ -63,7 +63,7 @@ static const char headerblurb[] = "# well as empty lines are ignored. Lines have a length limit but this\n" "# is not a serious limitation as the format of the entries is fixed and\n" "# checked by gpg-agent. A non-comment line starts with optional white\n" -"# space, followed by the SHA-1 fingerpint in hex, followed by a flag\n" +"# space, followed by the SHA-1 fingerprint in hex, followed by a flag\n" "# which may be one of 'P', 'S' or '*' and optionally followed by a list of\n" "# other flags. The fingerprint may be prefixed with a '!' to mark the\n" "# key as not trusted. You should give the gpg-agent a HUP or run the\n" @@ -736,7 +736,7 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag) insert a line break. The double percent sign is actually needed because it is also a printf format string. If you need to insert a plain % sign, you need to encode it as - "%%25". The second "%s" gets replaced by a hexdecimal + "%%25". The second "%s" gets replaced by a hexadecimal fingerprint string whereas the first one receives the name as stored in the certificate. */ L_("Please verify that the certificate identified as:%%0A" diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index e92a94231..a98d61f71 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -188,13 +188,13 @@ MAKE_J=6 INST_NAME=gnupg-w32 -# Use this to override the installaion directory for native builds. +# Use this to override the installation directory for native builds. INSTALL_PREFIX=none # Set this to the location of wixtools WIXPREFIX=$(shell readlink -f ~/w32root/wixtools) -# If patchelf(1) is not availale disable the command. +# If patchelf(1) is not available disable the command. PATCHELF := $(shell patchelf --version 2>/dev/null >/dev/null || echo "echo please run: ")patchelf # Read signing information from ~/.gnupg-autogen.rc @@ -1401,7 +1401,7 @@ endif # -# Check availibility of standard tools and prepare everything. +# Check availability of standard tools and prepare everything. # check-tools: $(stampdir)/stamp-directories diff --git a/build-aux/speedo/w32/README.txt b/build-aux/speedo/w32/README.txt index 7c2909507..df7b3a807 100644 --- a/build-aux/speedo/w32/README.txt +++ b/build-aux/speedo/w32/README.txt @@ -60,7 +60,7 @@ Below is the README file as distributed with the GnuPG source. 4. Software Versions of the Included Packages ============================================= -GnuPG for Windows depends on several independet developed packages +GnuPG for Windows depends on several independent developed packages which are part of the installation. These packages along with their version numbers and the SHA-1 checksums of their compressed tarballs are listed here: diff --git a/build-aux/speedo/w32/g4wihelp.c b/build-aux/speedo/w32/g4wihelp.c index bae4b837c..33d186c40 100644 --- a/build-aux/speedo/w32/g4wihelp.c +++ b/build-aux/speedo/w32/g4wihelp.c @@ -24,7 +24,7 @@ ************************************************************ * The code for the splash screen has been taken from the Splash * plugin of the NSIS 2.04 distribution. That code comes without - * explicit copyright notices in tyhe source files or author names, it + * explicit copyright notices in the source files or author names, it * seems that it has been written by Justin Frankel; not sure about * the year, though. [wk 2005-11-28] * diff --git a/common/asshelp.c b/common/asshelp.c index 957ca994d..f17a32e52 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -695,7 +695,7 @@ get_assuan_server_version (assuan_context_t ctx, int mode, char **r_version) /* Print a warning if the server's version number is less than our * version number. Returns an error code on a connection problem. - * CTX is the Assuan context, SERVERNAME is the name of teh server, + * CTX is the Assuan context, SERVERNAME is the name of the server, * STATUS_FUNC and STATUS_FUNC_DATA is a callback to emit status * messages. If PRINT_HINTS is set additional hints are printed. For * MODE see get_assuan_server_version. */ diff --git a/common/audit.c b/common/audit.c index 42a2cf6d6..551563c61 100644 --- a/common/audit.c +++ b/common/audit.c @@ -44,7 +44,7 @@ struct log_item_s gpg_error_t err; /* The logged error code. */ int intvalue; /* A logged integer value. */ char *string; /* A malloced string or NULL. */ - ksba_cert_t cert; /* A certifciate or NULL. */ + ksba_cert_t cert; /* A certificate or NULL. */ unsigned int have_err:1; unsigned int have_intvalue:1; }; diff --git a/common/audit.h b/common/audit.h index 05f39533d..9fadba1b2 100644 --- a/common/audit.h +++ b/common/audit.h @@ -76,7 +76,7 @@ typedef enum /* The signature is a detached one. */ AUDIT_CERT_ONLY_SIG, - /* A certifciate only signature has been detected. */ + /* A certificate only signature has been detected. */ AUDIT_DATA_HASH_ALGO, /* int */ /* The hash algo given as argument is used for the data. This diff --git a/common/compliance.c b/common/compliance.c index 2df10d2e2..d421b0371 100644 --- a/common/compliance.c +++ b/common/compliance.c @@ -42,7 +42,7 @@ static int module; /* This value is used by DSA and RSA checks in addition to the hard * coded length checks. It allows one to increase the required key length - * using a confue file. */ + * using a config file. */ static unsigned int min_compliant_rsa_length; /* Return the address of a compliance cache variable for COMPLIANCE. diff --git a/common/dotlock.c b/common/dotlock.c index fe6d7fe71..ae77fad8a 100644 --- a/common/dotlock.c +++ b/common/dotlock.c @@ -1450,7 +1450,7 @@ dotlock_take_unix (dotlock_t h, long timeout) int wtimereal; if (ownerchanged) - wtime = 0; /* Reset because owner chnaged. */ + wtime = 0; /* Reset because owner changed. */ wtimereal = next_wait_interval (&wtime, &timeout); if (!timeout) diff --git a/common/gettime.c b/common/gettime.c index 136c47ca7..180f388bb 100644 --- a/common/gettime.c +++ b/common/gettime.c @@ -124,7 +124,7 @@ timegm (struct tm *tm) /* Version of the GNU timegm which returns an unsigned 64 bit integer * instead of the usually signed time_t. On error (uint64_t)(-1) is - * returned. This function is mostly here becuase on 32 bit Windows + * returned. This function is mostly here because on 32 bit Windows * we have an internal API to get the system time even after * 2023-01-19. For 32 bit Unix we need to suffer from the too short * time_t and no system function to construct the time from a tm. */ diff --git a/common/homedir.c b/common/homedir.c index deb6f3616..392910867 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -1089,7 +1089,7 @@ gnupg_daemon_rootdir (void) n = GetSystemDirectoryA (path, sizeof path); if (!n || n >= sizeof path) - name = xstrdup ("/"); /* Error - use the curret top dir instead. */ + name = xstrdup ("/"); /* Error - use the current top dir instead. */ else name = xstrdup (path); gpgrt_annotate_leaked_object (name); @@ -1306,7 +1306,7 @@ _gnupg_socketdir_internal (int skip_checks, unsigned *r_info) strcat (prefixbuffer, gnupgname); } - /* Check whether the gnupg sub directory (or the specified diretory) + /* Check whether the gnupg sub directory (or the specified directory) * has proper permissions. */ if (stat (prefix, &sb)) { diff --git a/common/iobuf.c b/common/iobuf.c index e46eeac95..7aaf3a878 100644 --- a/common/iobuf.c +++ b/common/iobuf.c @@ -1670,7 +1670,7 @@ iobuf_ioctl (iobuf_t a, iobuf_ioctl_t cmd, int intval, void *ptrval) /* Peek at a justed opened file. Use this only directly after a * file has been opened for reading. Don't use it after you did * a seek. This works only if just file filter has been - * pushed. Expects a buffer wit size INTVAL at PTRVAL and returns + * pushed. Expects a buffer with size INTVAL at PTRVAL and returns * the number of bytes put into the buffer. */ if (DBG_IOBUF) log_debug ("iobuf-%d.%d: ioctl '%s' peek\n", diff --git a/common/iobuf.h b/common/iobuf.h index 4354c718d..5fa064c20 100644 --- a/common/iobuf.h +++ b/common/iobuf.h @@ -204,7 +204,7 @@ struct iobuf_struct byte *buf; } d; - /* A external drain buffer for reading/writting data skipping internal + /* A external drain buffer for reading/writing data skipping internal draint buffer D.BUF. This allows zerocopy operation reducing processing overhead across filter stack. diff --git a/common/mkdir_p.h b/common/mkdir_p.h index 1e939b32b..08f388916 100644 --- a/common/mkdir_p.h +++ b/common/mkdir_p.h @@ -34,7 +34,7 @@ /* Create a directory as well as any missing parents. - The arguments must be NULL termianted. If DIRECTORY_COMPONENTS... + The arguments must be NULL terminated. If DIRECTORY_COMPONENTS... consists of two elements, "foo/bar" and "xyzzy", this function will first try to create the directory "foo/bar" and then the directory "foo/bar/xyzzy". On success returns 0, otherwise an error code is diff --git a/common/openpgp-fpr.c b/common/openpgp-fpr.c index 7b110085f..7860d3872 100644 --- a/common/openpgp-fpr.c +++ b/common/openpgp-fpr.c @@ -136,7 +136,7 @@ compute_openpgp_fpr (int keyversion, int pgpalgo, unsigned long timestamp, /* log_printhex (iov[i].data, iov[i].len, "cmpfpr i=%d: ", i); */ err = gcry_md_hash_buffers (hashalgo, 0, result, iov, iovcnt); - /* log_printhex (result, 20, "fingerpint: "); */ + /* log_printhex (result, 20, "fingerprint: "); */ /* Better clear the first element because it was set by us. */ iov[0].size = 0; diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c index 92f0dfbcd..0a7aae000 100644 --- a/common/openpgp-oid.c +++ b/common/openpgp-oid.c @@ -129,7 +129,7 @@ make_flagged_int (unsigned long value, char *buf, size_t buflen) /* fixme: figure out the number of bits in an ulong and start with that value as shift (after making it a multiple of 7) a more - straigtforward implementation is to do it in reverse order using + straightforward implementation is to do it in reverse order using a temporary buffer - saves a lot of compares */ for (more=0, shift=28; shift > 0; shift -= 7) { diff --git a/common/session-env.c b/common/session-env.c index e774c1d9b..3ffe3f0f5 100644 --- a/common/session-env.c +++ b/common/session-env.c @@ -315,7 +315,7 @@ session_env_putenv (session_env_t se, const char *string) } -/* Same as session_env_putenv but with name and value given as distict +/* Same as session_env_putenv but with name and value given as distinct values. */ gpg_error_t session_env_setenv (session_env_t se, const char *name, const char *value) @@ -355,7 +355,7 @@ session_env_getenv (session_env_t se, const char *name) object. The returned value is valid as long as SE is valid and as long it has not been removed or updated by a call to session_env_putenv. If the variable does not exist, the function - tries to return the value trough a call to getenv; if that returns + tries to return the value through a call to getenv; if that returns a value, this value is recorded and used. If no value could be found, returns NULL. The caller must not change the returned value. */ diff --git a/common/sexp-parse.h b/common/sexp-parse.h index 0403d65f5..86372e028 100644 --- a/common/sexp-parse.h +++ b/common/sexp-parse.h @@ -104,7 +104,7 @@ smatch (unsigned char const **buf, size_t buflen, const char *token) return 1; } -/* Format VALUE for use as the length indicatior of an S-expression. +/* Format VALUE for use as the length indicator of an S-expression. The caller needs to provide a buffer HELP_BUFFER with a length of HELP_BUFLEN. The return value is a pointer into HELP_BUFFER with the formatted length string. The colon and a trailing nul are diff --git a/common/sexputil.c b/common/sexputil.c index 15fd7cf1d..f9842391e 100644 --- a/common/sexputil.c +++ b/common/sexputil.c @@ -199,7 +199,7 @@ make_canon_sexp_pad (gcry_sexp_t sexp, int secure, } /* Return the so called "keygrip" which is the SHA-1 hash of the - public key parameters expressed in a way dependend on the algorithm. + public key parameters expressed in a way dependent on the algorithm. KEY is expected to be an canonical encoded S-expression with a public or private key. KEYLEN is the length of that buffer. @@ -1195,7 +1195,7 @@ cipher_mode_to_string (int mode) } } -/* Return the cannonical name of the ECC curve in KEY. */ +/* Return the canonical name of the ECC curve in KEY. */ const char * get_ecc_curve_from_key (gcry_sexp_t key) { diff --git a/common/sysutils.c b/common/sysutils.c index 780af58bd..2bacae2ea 100644 --- a/common/sysutils.c +++ b/common/sysutils.c @@ -588,7 +588,7 @@ translate_sys2libc_fd_int (int fd, int for_write) /* * Parse the string representation of a file reference (file handle on * Windows or file descriptor on POSIX) in FDSTR. The string - * representation may be either of folllowing: + * representation may be either of following: * (1) 0, 1, or 2 which means stdin, stdout, and stderr, respectively. * (2) Integer representation (by %d of printf). @@ -1106,7 +1106,7 @@ modestr_to_mode (const char *modestr, mode_t oldmode) int gnupg_mkdir (const char *name, const char *modestr) { - /* Note that gpgrt_mkdir also sets ERRNO in addition to returing an + /* Note that gpgrt_mkdir also sets ERRNO in addition to returning an * gpg-error style error code. */ return gpgrt_mkdir (name, modestr); } diff --git a/common/t-iobuf.c b/common/t-iobuf.c index aacf27a8b..9aa0720f6 100644 --- a/common/t-iobuf.c +++ b/common/t-iobuf.c @@ -29,7 +29,7 @@ */ /* The whole code here does not very fill into our general test frame - * work patter. But let's keep it as it is. */ + * work pattern. But let's keep it as it is. */ #include #include diff --git a/common/tlv-builder.c b/common/tlv-builder.c index 59e2691e0..0fa5fc2cc 100644 --- a/common/tlv-builder.c +++ b/common/tlv-builder.c @@ -95,7 +95,7 @@ ensure_space (tlv_builder_t tb) * element is described by CLASS, TAG, VALUE, and VALUEEN. CLASS and * TAG must describe a primitive element and (VALUE,VALUELEN) specify * its value. The value is a pointer and its object must not be - * changed as long as the instance TB exists. For a TAG_NULL no vlaue + * changed as long as the instance TB exists. For a TAG_NULL no value * is expected. Errors are not returned but recorded for later * retrieval. */ void diff --git a/common/tlv-parser.c b/common/tlv-parser.c index c9b33d4b6..2cafac3e9 100644 --- a/common/tlv-parser.c +++ b/common/tlv-parser.c @@ -42,7 +42,7 @@ struct bufferlist_s /* An object to control the ASN.1 parsing. */ struct tlv_parser_s { - /* The orginal buffer with the entire pkcs#12 object and its length. */ + /* The original buffer with the entire pkcs#12 object and its length. */ const unsigned char *origbuffer; size_t origbufsize; diff --git a/common/tlv.h b/common/tlv.h index afaa649d9..3136195a5 100644 --- a/common/tlv.h +++ b/common/tlv.h @@ -141,7 +141,7 @@ void tlv_builder_add_end (tlv_builder_t tb); gpg_error_t tlv_builder_finalize (tlv_builder_t tb, void **r_obj, size_t *r_objlen); -/* Wite a TLV header to MEMBUF. */ +/* Write a TLV header to MEMBUF. */ void put_tlv_to_membuf (membuf_t *membuf, int class, int tag, int constructed, size_t length); diff --git a/common/util.h b/common/util.h index f8447aea7..671ffbcb7 100644 --- a/common/util.h +++ b/common/util.h @@ -323,7 +323,7 @@ void setup_libgcrypt_logging (void); /* Print an out of core message and die. */ void xoutofcore (void); -/* Wrapper aroung gpgrt_reallocarray. Uses the gpgrt alloc function +/* Wrapper around gpgrt_reallocarray. Uses the gpgrt alloc function * which redirects to the Libgcrypt versions via * init_common_subsystems. Thus this can be used interchangeable with * the other alloc functions. */ diff --git a/configure.ac b/configure.ac index 1f0142140..71c061481 100644 --- a/configure.ac +++ b/configure.ac @@ -1601,7 +1601,7 @@ if test "$build_tpm2d" = "yes"; then # until version 2.4.0. # # Note: the missing API is fairly serious and is also easily backportable - # so keep the check below as is intead of going by library version number. + # so keep the check below as is instead of going by library version number. ## AC_CHECK_LIB(tss2-esys, Esys_TR_GetTpmHandle, [], [ AC_MSG_WARN([Need Esys_TR_GetTpmHandle API (usually requires Intel TSS 2.4.0 or later, disabling TPM support)]) @@ -1638,7 +1638,7 @@ if test "$GCC" = yes; then mycflags= mycflags_save=$CFLAGS - # Check whether gcc does not emit a diagnositc for unknown -Wno-* + # Check whether gcc does not emit a diagnostic for unknown -Wno-* # options. This is the case for gcc >= 4.6 AC_MSG_CHECKING([if gcc ignores unknown -Wno-* options]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/dirmngr/ONEWS b/dirmngr/ONEWS index cb2050748..154d8e0bf 100644 --- a/dirmngr/ONEWS +++ b/dirmngr/ONEWS @@ -55,7 +55,7 @@ Noteworthy changes in version 1.0.1 (2007-08-16) Noteworthy changes in version 1.0.0 (2006-11-29) ------------------------------------------------ - * Bumbed the version number. + * Bumped the version number. * Removed included gettext. We now require the system to provide a suitable installation. @@ -174,7 +174,7 @@ Noteworthy changes in version 0.5.4 (2004-04-29) ------------------------------------------------ * New commands --ocsp-responder and --ocsp-signer to define a default - OCSP reponder if a certificate does not contain an assigned OCSP + OCSP responder if a certificate does not contain an assigned OCSP responder. diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index b7b5b3d15..07a47a525 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -225,7 +225,7 @@ cert_compute_fpr (ksba_cert_t cert, unsigned char *digest) -/* Cleanup one slot. This releases all resourses but keeps the actual +/* Cleanup one slot. This releases all resources but keeps the actual slot in the cache marked for reuse. */ static void clean_cache_slot (cert_item_t ci) diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index d58a27372..5a2a45bc1 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1104,12 +1104,12 @@ main (int argc, char **argv) socket_name = dirmngr_socket_name (); - /* The configuraton directories for use by gpgrt_argparser. */ + /* The configuration directories for use by gpgrt_argparser. */ gpgrt_set_confdir (GPGRT_CONFDIR_SYS, gnupg_sysconfdir ()); gpgrt_set_confdir (GPGRT_CONFDIR_USER, gnupg_homedir ()); /* We are re-using the struct, thus the reset flag. We OR the - * flags so that the internal intialized flag won't be cleared. */ + * flags so that the internal initialized flag won't be cleared. */ argc = orig_argc; argv = orig_argv; pargs.argc = &argc; @@ -1748,7 +1748,7 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl) The format of such a file is line oriented where empty lines and lines starting with a hash mark are ignored. All other lines are - assumed to be colon seprated with these fields: + assumed to be colon separated with these fields: 1. field: Hostname 2. field: Portnumber diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index 50c97f140..ace40e6d5 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -241,7 +241,7 @@ struct server_control_s int audit_events; /* Send audit events to client. */ char *http_proxy; /* The used http_proxy or NULL. */ - nvc_t rootdse; /* Container wit the rootDSE properties. */ + nvc_t rootdse; /* Container with the rootDSE properties. */ unsigned int timeout; /* Timeout for connect calls in ms. */ diff --git a/dirmngr/dns.c b/dirmngr/dns.c index e0eb33244..f023e7395 100644 --- a/dirmngr/dns.c +++ b/dirmngr/dns.c @@ -9761,7 +9761,7 @@ struct dns_addrinfo *dns_ai_open(const char *host, const char *serv, enum dns_ty /* * FIXME: If an explicit A or AAAA record type conflicts with * .ai_family or with resconf.family (i.e. AAAA specified but - * AF_INET6 not in interection of .ai_family and resconf.family), + * AF_INET6 not in intersection of .ai_family and resconf.family), * then what? */ switch (ai->qtype) { diff --git a/dirmngr/http-ntbtls.c b/dirmngr/http-ntbtls.c index 2191acb60..c251f57ef 100644 --- a/dirmngr/http-ntbtls.c +++ b/dirmngr/http-ntbtls.c @@ -78,7 +78,7 @@ gnupg_http_tls_verify_cb (void *opaque, validate_flags = VALIDATE_FLAG_TLS; /* If we are using the standard hkps:// pool use the dedicated root - * certificate. Note that this differes from the GnuTLS + * certificate. Note that this differs from the GnuTLS * implementation which uses this special certificate only if no * other certificates are configured. */ /* Disabled for 2.3.2 to due problems with the standard hkps pool. */ diff --git a/dirmngr/http.c b/dirmngr/http.c index 6ae9029be..5723a13f2 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -295,7 +295,7 @@ struct http_session_s } verify; char *servername; /* Malloced server name. */ - /* A callback function to log details of TLS certifciates. */ + /* A callback function to log details of TLS certificates. */ void (*cert_log_cb) (http_session_t, gpg_error_t, const char *, const void **, size_t *); @@ -2018,7 +2018,7 @@ w32_get_proxy (const char *url) * If OVERRIDE_PROXY is not NULL and not empty, this proxy will be * used instead of any configured or dynamically determined proxy. If * the function runs into an error an error code is returned and NULL - * is stored at R_PROXY. If the fucntion was successful and a proxy + * is stored at R_PROXY. If the function was successful and a proxy * is to be used, information on the procy is stored at R_PROXY; if no * proxy shall be used R_PROXY is set to NULL. Caller should always * use release_proxy_info on the value stored at R_PROXY. */ @@ -2358,8 +2358,8 @@ run_gnutls_handshake (http_t hd, const char *server) #endif /*HTTP_USE_GNUTLS*/ -/* It INPUTSTRING is NULL get the intial token. If INPUTSTRING is not - * NULL, decode the string and use this as input from teh server. On +/* It INPUTSTRING is NULL get the initial token. If INPUTSTRING is not + * NULL, decode the string and use this as input from the server. On * success the final output token is stored at PROXY->OUTTOKEN and * OUTTOKLEN. IF the authentication succeeded OUTTOKLEN is zero. */ static gpg_error_t @@ -2379,7 +2379,7 @@ proxy_get_token (proxy_info_t proxy, const char *inputstring) if (inputstring) { - /* The input is expected in the token parameter but the paremter + /* The input is expected in the token parameter but the parameter * name is often forgotten. Thus we simply detect the parameter * name and skip it, assuming no other parameters are given. */ if (!strncmp (inputstring, "token=", 6)) @@ -4424,8 +4424,8 @@ same_host_p (parsed_uri_t a, parsed_uri_t b) /* Prepare a new URL for a HTTP redirect. INFO has flags controlling * the operation, STATUS_CODE is used for diagnostics, LOCATION is the - * value of the "Location" header, and R_URL reveives the new URL on - * success or NULL or error. Note that INFO->ORIG_URL is + * value of the "Location" header, and R_URL receives the new URL on + * success or NULL on error. Note that INFO->ORIG_URL is * required. */ gpg_error_t http_prepare_redirect (http_redir_info_t *info, unsigned int status_code, @@ -4596,7 +4596,7 @@ http_status2string (unsigned int status) } -/* Fucntion called on SIGHUP to flush internal variables. */ +/* Function called on SIGHUP to flush internal variables. */ void http_reinitialize (void) { diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c index 688972a89..c2c57d819 100644 --- a/dirmngr/ks-engine-ldap.c +++ b/dirmngr/ks-engine-ldap.c @@ -53,7 +53,7 @@ #define SERVERINFO_PGPKEYV2 2 /* Needs "pgpKeyV2" instead of "pgpKey"*/ #define SERVERINFO_SCHEMAV2 4 /* Version 2 of the Schema. */ #define SERVERINFO_NTDS 8 /* Server is an Active Directory. */ -#define SERVERINFO_GENERIC 16 /* Connected in genric mode. */ +#define SERVERINFO_GENERIC 16 /* Connected in generic mode. */ /* The page size requested from the server. */ @@ -1257,7 +1257,7 @@ return_all_attributes (LDAP *ld, LDAPMessage *msg, estream_t *fp) } /* Always print the DN - note that by using only unbkown attributes - * it is pissible to list just the DNs with out addiional + * it is possible to list just the DNs with out additional * linefeeds. */ es_fprintf (*fp, "Dn: %s\n", mydn? mydn : "[oops DN missing]"); @@ -1307,7 +1307,7 @@ return_all_attributes (LDAP *ld, LDAPMessage *msg, estream_t *fp) len = values[idx]->bv_len; while (len && (s = memchr (val, '\n', len))) { - s++; /* We als want to print the LF. */ + s++; /* We also want to print the LF. */ if (es_fwrite (val, s - val, 1, *fp) != 1) goto fwrite_failed; len -= (s-val); @@ -2361,7 +2361,7 @@ modlist_free (LDAPMod **modlist) LDAPMod *mod = *ml; char **ptr; - /* The list of values is a NULL termianted array of pointers. + /* The list of values is a NULL terminated array of pointers. If the list is NULL, there are no values. */ if (mod->mod_values) @@ -2460,7 +2460,7 @@ uncescape (char *str) /* Given one line from an info block (`gpg --list-{keys,sigs} --with-colons KEYID'), pull it apart and fill in the modlist with the relevant (for the LDAP schema) attributes. EXTRACT_STATE - should initally be set to 0 by the caller. SCHEMAV2 is set if the + should initially be set to 0 by the caller. SCHEMAV2 is set if the server supports the version 2 schema. */ static void extract_attributes (LDAPMod ***modlist, int *extract_state, @@ -2620,7 +2620,7 @@ extract_attributes (LDAPMod ***modlist, int *extract_state, memset (&tm, 0, sizeof (tm)); - /* parse_timestamp handles both seconds fromt he epoch and + /* parse_timestamp handles both seconds from the epoch and ISO 8601 format. We also need to handle YYYY-MM-DD format (as generated by gpg1 --with-colons --list-key). Check that first and then if it fails, then try @@ -2668,7 +2668,7 @@ extract_attributes (LDAPMod ***modlist, int *extract_state, memset (&tm, 0, sizeof (tm)); - /* parse_timestamp handles both seconds fromt he epoch and + /* parse_timestamp handles both seconds from the epoch and ISO 8601 format. We also need to handle YYYY-MM-DD format (as generated by gpg1 --with-colons --list-key). Check that first and then if it fails, then try diff --git a/dirmngr/ldap-misc.c b/dirmngr/ldap-misc.c index c3a659d5c..a3aef0e62 100644 --- a/dirmngr/ldap-misc.c +++ b/dirmngr/ldap-misc.c @@ -220,7 +220,7 @@ ldap_to_gpg_err (LDAP *ld) * ^&SCOPE&(objectClasses=*) * * Give a scope and a filter. Note that R_SCOPE is only changed if a - * STRING has scope parameter. Setting this initally to -1 allows to + * STRING has scope parameter. Setting this initially to -1 allows to * detect this case. */ gpg_error_t diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c index b80012d03..c1ea04979 100644 --- a/dirmngr/ldap.c +++ b/dirmngr/ldap.c @@ -256,7 +256,7 @@ url_fetch_ldap (ctrl_t ctrl, const char *url, ksba_reader_t *reader) } if (ludp->lud_scheme && !strcmp (ludp->lud_scheme, "ldaps")) - tls_mode = 2; /* LDAP-over-TLS here becuase we get it from certs. */ + tls_mode = 2; /* LDAP-over-TLS here because we get it from certs. */ else tls_mode = 0; @@ -524,7 +524,7 @@ make_one_filter (const char *pattern, char **r_result) if (*pattern) { /* We need just the BaseDN. This assumes that the Subject - * is correcly stored in the DT. This is however not always + * is correctly stored in the DT. This is however not always * the case and the actual DN is different from the * subject. In this case we won't find anything. */ if (extfilt_need_escape (pattern) @@ -606,7 +606,7 @@ make_one_filter (const char *pattern, char **r_result) /* Prepare an LDAP query to return the cACertificate attribute for DN. * All configured default servers are queried until one responds. * This function returns an error code or 0 and stored a newly - * allocated contect object at CONTEXT on success. */ + * allocated context object at CONTEXT on success. */ gpg_error_t start_cacert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context, const char *dn) @@ -778,7 +778,7 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context, if (argc >= DIM (argv) - 1) { /* Too many patterns. It does not make sense to allow an - arbitrary number of patters because the length of the + arbitrary number of patterns because the length of the command line is limited anyway. */ err = gpg_error (GPG_ERR_RESOURCE_LIMIT); goto leave; diff --git a/dirmngr/ldapserver.c b/dirmngr/ldapserver.c index ed38c7101..8cd193f86 100644 --- a/dirmngr/ldapserver.c +++ b/dirmngr/ldapserver.c @@ -60,7 +60,7 @@ ldapserver_list_free (ldap_server_t servers) * Flags are: * * starttls := Use STARTTLS with a default port of 389 - * ldaptls := Tunnel LDAP trough a TLS tunnel with default port 636 + * ldaptls := Tunnel LDAP through a TLS tunnel with default port 636 * plain := Switch to plain unsecured LDAP. * (The last of these 3 flags is the effective one) * ntds := Use Active Directory authentication diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c index ad7ed962a..7de8b10e4 100644 --- a/dirmngr/ocsp.c +++ b/dirmngr/ocsp.c @@ -31,7 +31,7 @@ #include "certcache.h" #include "ocsp.h" -/* The maximum size we allow as a response from an OCSP reponder. */ +/* The maximum size we allow as a response from an OCSP responder. */ #define MAX_RESPONSE_SIZE 65536 @@ -526,7 +526,7 @@ check_signature_core (ctrl_t ctrl, ksba_cert_t cert, gcry_sexp_t s_sig, /* Check the signature of an OCSP response. OCSP is the context, S_SIG the signature value and MD the handle of the hash we used for the response. This function automagically finds the correct public - key. If SIGNER_FPR_LIST is not NULL, the default OCSP reponder has been + key. If SIGNER_FPR_LIST is not NULL, the default OCSP responder has been used and thus the certificate is one of those identified by the fingerprints. */ static gpg_error_t @@ -651,7 +651,7 @@ check_signature (ctrl_t ctrl, or directly through the CERT object is valid by running an OCSP transaction. With FORCE_DEFAULT_RESPONDER set only the configured default responder is used. If R_REVOKED_AT or R_REASON are not - NULL and the certificat has been revoked the revocation time and + NULL and the certificate has been revoked the revocation time and the reasons are stored there. */ gpg_error_t ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr, @@ -723,7 +723,7 @@ ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr, } /* Figure out the OCSP responder to use. - 1. Try to get the reponder from the certificate. + 1. Try to get the responder from the certificate. We do only take http and https style URIs into account. 2. If this fails use the default responder, if any. */ diff --git a/dirmngr/server.c b/dirmngr/server.c index 32c85d07b..710317e5e 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -932,7 +932,7 @@ proc_wkd_get (ctrl_t ctrl, assuan_context_t ctx, char *line) err = get_dns_srv (ctrl, domain, "openpgpkey", NULL, &srvs, &srvscount); if (err) { - /* Ignore server failed becuase there are too many resolvers + /* Ignore server failed because there are too many resolvers * which do not work as expected. */ if (gpg_err_code (err) == GPG_ERR_SERVER_FAILED) err = 0; /*(srvcount is guaranteed to be 0)*/ diff --git a/dirmngr/t-ldap-parse-uri.c b/dirmngr/t-ldap-parse-uri.c index 984e1412f..e46bbee83 100644 --- a/dirmngr/t-ldap-parse-uri.c +++ b/dirmngr/t-ldap-parse-uri.c @@ -291,7 +291,7 @@ main (int argc, char **argv) } if (argc) { - fprintf (stderr, PGM ": no argumenst are expected\n"); + fprintf (stderr, PGM ": no arguments are expected\n"); exit (1); } diff --git a/dirmngr/validate.c b/dirmngr/validate.c index 02db3c270..94a468b38 100644 --- a/dirmngr/validate.c +++ b/dirmngr/validate.c @@ -42,7 +42,7 @@ enum cert_usage_modes CERT_USAGE_MODE_VRFY, /* Usable for verification. */ CERT_USAGE_MODE_DECR, /* Usable for decryption. */ CERT_USAGE_MODE_CERT, /* Usable for cert signing. */ - CERT_USAGE_MODE_OCSP, /* Usable for OCSP respone signing. */ + CERT_USAGE_MODE_OCSP, /* Usable for OCSP response signing. */ CERT_USAGE_MODE_CRL /* Usable for CRL signing. */ }; @@ -56,7 +56,7 @@ struct chain_item_s ksba_cert_t cert; /* The certificate. */ unsigned char fpr[20]; /* Fingerprint of the certificate. */ int is_self_signed; /* This certificate is self-signed. */ - int is_valid; /* The certifiate is valid except for revocations. */ + int is_valid; /* The certificate is valid except for revocations. */ }; typedef struct chain_item_s *chain_item_t; @@ -173,7 +173,7 @@ check_cert_policy (ksba_cert_t cert) if (err) return err; - /* STRING is a line delimited list of certifiate policies as stored + /* STRING is a line delimited list of certificate policies as stored in the certificate. The line itself is colon delimited where the first field is the OID of the policy and the second field either N or C for normal or critical extension */ diff --git a/doc/DETAILS b/doc/DETAILS index a278d045f..c689046be 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -132,7 +132,7 @@ described here. *** Field 5 - KeyID This is the 64 bit keyid as specified by OpenPGP and the last 64 - bit of the SHA-1 fingerprint of an X.509 certifciate. + bit of the SHA-1 fingerprint of an X.509 certificate. *** Field 6 - Creation date @@ -1101,7 +1101,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: gpg-agent. - keyedit.passwd :: Changing the password failed. - nomdc_with_legacy_cipher :: The message was not MDC protected. - Use the command line to lern about a workaround. + Use the command line to learn about a workaround. - random-compliance :: The random number generator or the used version of Libgcrypt do not fulfill the requirements of the current compliance setting. The error code is often @@ -1179,7 +1179,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: . For example "B", "KiB", or "MiB". *** BACKUP_KEY_CREATED - A backup of a key identified by has been writte to + A backup of a key identified by has been written to the file ; is percent-escaped. *** MOUNTPOINT @@ -1263,7 +1263,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: *** CERTINFO [