summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2024-05-13 00:09:23 +0200
committerWerner Koch <wk@gnupg.org>2024-05-31 12:28:32 +0200
commit42b0e9558a308dbc954ee60c3d346b5cabcd2fdb (patch)
treef073776758cd706a0cadf0bd64073d1669a8d691 /scd
parentg13: Adjust for changed gnupg_process_spawn. (diff)
downloadgnupg2-42b0e9558a308dbc954ee60c3d346b5cabcd2fdb.tar.xz
gnupg2-42b0e9558a308dbc954ee60c3d346b5cabcd2fdb.zip
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
Diffstat (limited to 'scd')
-rw-r--r--scd/apdu.c2
-rw-r--r--scd/app-nks.c2
-rw-r--r--scd/app-openpgp.c2
-rw-r--r--scd/app-p15.c10
-rw-r--r--scd/app-piv.c4
-rw-r--r--scd/app.c2
-rw-r--r--scd/ccid-driver.c2
-rw-r--r--scd/command.c4
-rw-r--r--scd/iso7816.c4
-rw-r--r--scd/scdaemon.c4
10 files changed, 18 insertions, 18 deletions
diff --git a/scd/apdu.c b/scd/apdu.c
index 2e38a273a..35b845b40 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2310,7 +2310,7 @@ apdu_open_reader (struct dev_list *dl)
/* Open an remote reader and return an internal slot number or -1 on
error. This function is an alternative to apdu_open_reader and used
with remote readers only. Note that the supplied CLOSEFNC will
- only be called once and the slot will not be valid afther this.
+ only be called once and the slot will not be valid after this.
If PORTSTR is NULL we default to the first available port.
*/
diff --git a/scd/app-nks.c b/scd/app-nks.c
index c207fd500..7c0eedfd0 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -528,7 +528,7 @@ find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
break;
if (!filelist[idx].fid)
{
- log_debug ("nks: Ooops: Unkown FID cached!\n");
+ log_debug ("nks: Ooops: Unknown FID cached!\n");
err = gpg_error (GPG_ERR_BUG);
goto leave;
}
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 5882153eb..4af4f880e 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -190,7 +190,7 @@ struct app_local_s {
struct
{
unsigned int is_v2:1; /* Compatible to v2 or later. */
- unsigned int is_v3:1; /* Comatible to v3 or later. */
+ unsigned int is_v3:1; /* Compatible to v3 or later. */
unsigned int has_button:1; /* Has confirmation button or not. */
unsigned int sm_supported:1; /* Secure Messaging is supported. */
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 6af10b46b..377cd5024 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -295,7 +295,7 @@ struct prkdf_object_s
/* PKCS#15 info whether this is an EC key. Default is RSA. Note
* that there is also a KEYALGO field which is derived from the
- * publick key via Libgcrypt. */
+ * public key via Libgcrypt. */
unsigned int is_ecc:1;
/* The key's usage flags. */
@@ -1571,7 +1571,7 @@ parse_common_obj_attr (unsigned char const **buffer, size_t *size,
/* Parse the commonKeyAttributes. On success store the objid at
* (R_OBJID/R_OBJIDLEN), sets the key usage flags at USAGEFLAGS and
- * the optiona key refrence at R_KEY_REFERENCE. The latter is only
+ * the optional key reference at R_KEY_REFERENCE. The latter is only
* valid if true is also stored at R_KEY_REFERENCE_VALID.
*
* Example data:
@@ -3751,7 +3751,7 @@ read_p15_info (app_t app)
/* See whether we can extend the private key information using
* information from certificates. We use only the first matching
* certificate; if we want to change this strategy we should walk
- * over the certificates and then find the corresponsing private key
+ * over the certificates and then find the corresponding private key
* objects. */
app->app_local->any_gpgusage = 0;
for (prkdf = app->app_local->private_key_info; prkdf; prkdf = prkdf->next)
@@ -4840,7 +4840,7 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
int i;
/* Put the AODFs into an array for easier sorting. Note that we
- * handle onl the first 16 encountrer which should be more than
+ * handle only the first 16 encountrer which should be more than
* enough. */
for (aodf = app->app_local->auth_object_info;
aodf && naodf < DIM(aodfarray); aodf = aodf->next)
@@ -6226,7 +6226,7 @@ do_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr,
if (aodf->label && !ascii_strcasecmp (aodf->label, keyidstr))
break;
if (!aodf)
- return err; /* Re-use the original error code. */
+ return err; /* Reuse the original error code. */
}
else /* Find the authentication object to this private key object. */
{
diff --git a/scd/app-piv.c b/scd/app-piv.c
index d7f9acca3..8b9c9a608 100644
--- a/scd/app-piv.c
+++ b/scd/app-piv.c
@@ -354,7 +354,7 @@ get_cached_data (app_t app, int tag,
/* Remove data object described by TAG from the cache. If TAG is 0
- * all cache iterms are flushed. */
+ * all cache items are flushed. */
static void
flush_cached_data (app_t app, int tag)
{
@@ -2983,7 +2983,7 @@ writekey_ecc (app_t app, data_object_t dobj, int keyref,
/* Write a key to a slot. This command requires proprietary
- * extensions of the PIV specification and is thus only implemnted for
+ * extensions of the PIV specification and is thus only implemented for
* supported card types. The input is a canonical encoded
* S-expression with the secret key in KEYDATA and its length (for
* assertion) in KEYDATALEN. KEYREFSTR needs to be the usual 2
diff --git a/scd/app.c b/scd/app.c
index 09a148416..9a5150fd1 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -1399,7 +1399,7 @@ app_munge_serialno (card_t card)
* ! !----------- Form factor
* !----------------- Our prefix
* Yubico seems to use the decimalized version of their S/N
- * as the OpenPGP card S/N. Thus in theory we can contruct the
+ * as the OpenPGP card S/N. Thus in theory we can construct the
* number from this information so that we do not rely on having
* the OpenPGP app enabled.
*/
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 0fcd5a3d8..92387a1a8 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1812,7 +1812,7 @@ ccid_open_usb_reader (const char *spec_reader_name,
my_npth_protect ();
- /* Perform any vendor specific intialization. */
+ /* Perform any vendor specific initialization. */
rc = ccid_vendor_specific_init (*handle);
leave:
diff --git a/scd/command.c b/scd/command.c
index a2274f15a..97e6accff 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -151,7 +151,7 @@ hex_to_buffer (const char *string, size_t *r_length)
/* Reset the card and free the application context. With SEND_RESET
set to true actually send a RESET to the reader; this is the normal
way of calling the function. If KEEP_LOCK is set and the session
- is locked that lock wil not be released. */
+ is locked that lock will not be released. */
static void
do_reset (ctrl_t ctrl, int send_reset, int keep_lock)
{
@@ -1356,7 +1356,7 @@ static const char hlp_writecert[] =
"\n"
"This command is used to store a certificate on a smartcard. The\n"
"allowed certids depend on the currently selected smartcard\n"
- "application. The actual certifciate is requested using the inquiry\n"
+ "application. The actual certificate is requested using the inquiry\n"
"\"CERTDATA\" and needs to be provided in its raw (e.g. DER) form.\n"
"\n"
"In almost all cases a PIN will be requested. See the related\n"
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 703f1fdab..6634cd4a7 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -471,7 +471,7 @@ iso7816_reset_retry_counter (int slot, int chvno,
}
-/* Perform a SELECT DATA command to OCCURANCE of TAG. */
+/* Perform a SELECT DATA command to OCCURRENCE of TAG. */
gpg_error_t
iso7816_select_data (int slot, int occurrence, int tag)
{
@@ -660,7 +660,7 @@ iso7816_manage_security_env (int slot, int p1, int p2,
}
-/* Perform the security operation COMPUTE DIGITAL SIGANTURE. On
+/* Perform the security operation COMPUTE DIGITAL SIGNATURE. On
success 0 is returned and the data is available in a newly
allocated buffer stored at RESULT with its length stored at
RESULTLEN. For LE see do_generate_keypair. */
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 2a9b0923c..0127c8dda 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -535,12 +535,12 @@ main (int argc, char **argv )
Now we are 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 ());
/* 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;