diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/app-common.h | 2 | ||||
| -rw-r--r-- | scd/app-nks.c | 4 | ||||
| -rw-r--r-- | scd/app-p15.c | 2 | ||||
| -rw-r--r-- | scd/app-piv.c | 4 | ||||
| -rw-r--r-- | scd/app.c | 4 | ||||
| -rw-r--r-- | scd/ccid-driver.c | 4 | ||||
| -rw-r--r-- | scd/command.c | 6 | ||||
| -rw-r--r-- | scd/scdaemon.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/scd/app-common.h b/scd/app-common.h index dc5684b39..752e75da2 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -120,7 +120,7 @@ struct card_ctx_s { /* The object describing a card's applications. A card may have - * several applications and it is usuallay required to explicity + * several applications and it is usually required to explicitly * switch between applications. */ struct app_ctx_s { app_t next; diff --git a/scd/app-nks.c b/scd/app-nks.c index bdf065145..efc11296a 100644 --- a/scd/app-nks.c +++ b/scd/app-nks.c @@ -255,7 +255,7 @@ keygripstr_from_pk_file (app_t app, int fid, char *r_gripstr) -1 = Error retrieving the data, -2 = No such PIN, -3 = PIN blocked, - -4 = NullPIN activ, + -4 = NullPIN active, n >= 0 = Number of verification attempts left. */ static int get_chv_status (app_t app, int sigg, int pwid) @@ -287,7 +287,7 @@ get_chv_status (app_t app, int sigg, int pwid) else if (sw == 0x6983) rc = -3; /* PIN is blocked. */ else if (sw == 0x6985) - rc = -4; /* NullPIN is activ. */ + rc = -4; /* NullPIN is active. */ else if ((sw & 0xfff0) == 0x63C0) rc = (sw & 0x000f); /* PIN has N tries left. */ else diff --git a/scd/app-p15.c b/scd/app-p15.c index 86902e90b..016f5c3f3 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -2057,7 +2057,7 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result) } } - /* Igonore further objects which might be there due to future + /* Ignore further objects which might be there due to future extensions of pkcs#15. */ ready: diff --git a/scd/app-piv.c b/scd/app-piv.c index cefc9d997..38608f47b 100644 --- a/scd/app-piv.c +++ b/scd/app-piv.c @@ -1992,7 +1992,7 @@ ask_and_prepare_chv (app_t app, ctrl_t ctrl, /* Verify the card holder verification identified by KEYREF. This is - * either the Appication PIN or the Global PIN. If FORCE is true a + * either the Application PIN or the Global PIN. If FORCE is true a * verification is always done. */ static gpg_error_t verify_chv (app_t app, ctrl_t ctrl, int keyref, int force, @@ -2587,7 +2587,7 @@ do_decipher (app_t app, ctrl_t ctrl, const char *keyidstr, * lost. Adjust for this. Unfortunately the ciphertext might have * also been prefixed with a leading zero to make it a positive * number; that may be a too long frame and we need to adjust for - * this too. Note that for ECC thoses fixes are not reqquired + * this too. Note that for ECC those fixes are not reqquired * because the first octet is always '04' to indicate an * uncompressed point. */ if (indatalen > framelen) @@ -491,7 +491,7 @@ app_new_register (int slot, ctrl_t ctrl, const char *name, { /* No version - this is not a Yubikey 5. We now * switch to the OTP app and take the first - * three bytes of the reponse as version + * three bytes of the response as version * number. */ xfree (buf); buf = NULL; @@ -1421,7 +1421,7 @@ app_readcert (card_t card, ctrl_t ctrl, const char *certid, * length (for assertions) at PKLEN; the caller must release that * buffer. On error NULL will be stored at PK and PKLEN and an error * code returned. If the key is not required NULL may be passed for - * PK; this makse send if the APP_READKEY_FLAG_INFO has also been set. + * PK; this makes sense if the APP_READKEY_FLAG_INFO has also been set. * * This function might not be supported by all applications. */ gpg_error_t diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index 9d9870636..60252c04f 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -100,10 +100,10 @@ /* Max length of buffer with out CCID message header of 10-byte Sending: 547 for RSA-4096 key import APDU size = 540 (24+4+256+256) - commnd + lc + le = 4 + 3 + 0 + command + lc + le = 4 + 3 + 0 Sending: write data object of cardholder certificate APDU size = 2048 - commnd + lc + le = 4 + 3 + 0 + command + lc + le = 4 + 3 + 0 Receiving: 2048 for cardholder certificate */ #define CCID_MAX_BUF (2048+7+10) diff --git a/scd/command.c b/scd/command.c index c3ca93846..cd31218e8 100644 --- a/scd/command.c +++ b/scd/command.c @@ -226,7 +226,7 @@ open_card (ctrl_t ctrl) } /* Explicitly open a card for a specific use of APPTYPE or SERIALNO. - * If OPT_ALL ist set also add all possible additional apps. */ + * If OPT_ALL is set also add all possible additional apps. */ static gpg_error_t open_card_with_request (ctrl_t ctrl, const char *apptypestr, const char *serialno, @@ -1900,7 +1900,7 @@ static const char hlp_apdu[] = "Send an APDU to the current reader. This command bypasses the high\n" "level functions and sends the data directly to the card. HEXSTRING\n" "is expected to be a proper APDU. If HEXSTRING is not given no\n" - "commands are set to the card but the command will implictly check\n" + "commands are set to the card but the command will implicitly check\n" "whether the card is ready for use. \n" "\n" "Using the option \"--atr\" returns the ATR of the card as a status\n" @@ -2457,7 +2457,7 @@ pincache_put (ctrl_t ctrl, int slot, const char *appname, const char *pinref, /* Without an APPNAME etc or without a PIN we clear the cache and * thus there is no need to send the pin - even if the caller - * accidentially passed a pin. */ + * accidentally passed a pin. */ if (pin && slot != -1 && appname && pinref) { /* FIXME: Replace this by OCB mode and use the cache key as diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 942944f38..e64bb004e 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -1082,7 +1082,7 @@ handle_signal (int signo) /* Create a name for the socket. We check for valid characters as well as against a maximum allowed length for a unix domain socket is done. The function terminates the process in case of an error. - Returns: Pointer to an allcoated string with the absolute name of + Returns: Pointer to an allocated string with the absolute name of the socket used. */ static char * create_socket_name (char *standard_name) |