summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--scd/apdu.c10
-rw-r--r--scd/app-openpgp.c8
-rw-r--r--scd/app-p15.c2
-rw-r--r--scd/app.c2
-rw-r--r--scd/ccid-driver.c8
-rw-r--r--scd/command.c10
-rw-r--r--scd/iso7816.c2
7 files changed, 21 insertions, 21 deletions
diff --git a/scd/apdu.c b/scd/apdu.c
index 41790c61c..eb3d4b68b 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -686,7 +686,7 @@ static int
ct_get_status (int slot, unsigned int *status)
{
(void)slot;
- /* The status we returned is wrong but we don't care becuase ctAPI
+ /* The status we returned is wrong but we don't care because ctAPI
is not anymore required. */
*status = APDU_CARD_USABLE|APDU_CARD_PRESENT|APDU_CARD_ACTIVE;
return 0;
@@ -2035,7 +2035,7 @@ open_pcsc_reader_wrapped (const char *portstr)
int err;
unsigned int dummy_status;
- /* Note that we use the constant and not the fucntion because this
+ /* Note that we use the constant and not the function because this
code won't be be used under Windows. */
const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";
@@ -3158,7 +3158,7 @@ apdu_open_reader (const char *portstr)
with remote readers only. Note that the supplied CLOSEFNC will
only be called once and the slot will not be valid afther this.
- If PORTSTR is NULL we default to the first availabe port.
+ If PORTSTR is NULL we default to the first available port.
*/
int
apdu_open_remote_reader (const char *portstr,
@@ -4052,7 +4052,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
The return value is the status word or -1 for an invalid SLOT or
other non card related error. If RETBUF is not NULL, it will
receive an allocated buffer with the returned data. The length of
- that data will be put into *RETBUFLEN. The caller is reponsible
+ that data will be put into *RETBUFLEN. The caller is responsible
for releasing the buffer even in case of errors. */
int
apdu_send_le(int slot, int extended_mode,
@@ -4075,7 +4075,7 @@ apdu_send_le(int slot, int extended_mode,
return value is the status word or -1 for an invalid SLOT or other
non card related error. If RETBUF is not NULL, it will receive an
allocated buffer with the returned data. The length of that data
- will be put into *RETBUFLEN. The caller is reponsible for
+ will be put into *RETBUFLEN. The caller is responsible for
releasing the buffer even in case of errors. */
int
apdu_send (int slot, int extended_mode,
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 06ab32721..a7601b847 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1223,7 +1223,7 @@ retrieve_key_material (FILE *fp, const char *hexkeyid,
/* Get the public key for KEYNO and store it as an S-expresion with
the APP handle. On error that field gets cleared. If we already
know about the public key we will just return. Note that this does
- not mean a key is available; this is soley indicated by the
+ not mean a key is available; this is solely indicated by the
presence of the app->app_local->pk[KEYNO].key field.
Note that GnuPG 1.x does not need this and it would be too time
@@ -1548,7 +1548,7 @@ do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
send_keypair_info (app, ctrl, 2);
send_keypair_info (app, ctrl, 3);
/* Note: We do not send the Cardholder Certificate, because that is
- relativly long and for OpenPGP applications not really needed. */
+ relatively long and for OpenPGP applications not really needed. */
return 0;
}
@@ -1675,7 +1675,7 @@ check_pinpad_request (app_t app, pininfo_t *pininfo, int admin_pin)
}
-/* Verify a CHV either using using the pinentry or if possibile by
+/* Verify a CHV either using using the pinentry or if possible by
using a pinpad. PINCB and PINCB_ARG describe the usual callback
for the pinentry. CHVNO must be either 1 or 2. SIGCOUNT is only
used with CHV1. PINVALUE is the address of a pointer which will
@@ -4632,7 +4632,7 @@ app_select_openpgp (app_t app)
}
xfree (relptr);
- /* Some of the first cards accidently don't set the
+ /* Some of the first cards accidentally don't set the
CHANGE_FORCE_CHV bit but allow it anyway. */
if (app->card_version <= 0x0100 && manufacturer == 1)
app->app_local->extcap.change_force_chv = 1;
diff --git a/scd/app-p15.c b/scd/app-p15.c
index eb074ef7b..e4d9de031 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -276,7 +276,7 @@ typedef struct aodf_object_s *aodf_object_t;
struct app_local_s
{
/* The home DF. Note, that we don't yet support a multilevel
- hierachy. Thus we assume this is directly below the MF. */
+ hierarchy. Thus we assume this is directly below the MF. */
unsigned short home_df;
/* The type of the card. */
diff --git a/scd/app.c b/scd/app.c
index 5fa06b095..49e08e626 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -915,7 +915,7 @@ app_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
}
-/* Perform a GET CHALLENGE operation. This fucntion is special as it
+/* Perform a GET CHALLENGE operation. This function is special as it
directly accesses the card without any application specific
wrapper. */
gpg_error_t
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index bf5b73575..7f83f803c 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2321,7 +2321,7 @@ ccid_poll (ccid_driver_t handle)
}
else if (msg[0] == RDR_to_PC_HardwareError)
{
- DEBUGOUT ("hardware error occured\n");
+ DEBUGOUT ("hardware error occurred\n");
}
else
{
@@ -3136,7 +3136,7 @@ ccid_transceive (ccid_driver_t handle,
}
if (!!(tpdu[1] & 0x40) != handle->t1_nr)
- { /* Reponse does not match our sequence number. */
+ { /* Response does not match our sequence number. */
msg = send_buffer;
tpdu = msg + hdrlen;
tpdu[0] = nad_byte;
@@ -3563,7 +3563,7 @@ ccid_transceive_secure (ccid_driver_t handle,
handle->t1_ns ^= 1;
if (!!(tpdu[1] & 0x40) != handle->t1_nr)
- { /* Reponse does not match our sequence number. */
+ { /* Response does not match our sequence number. */
DEBUGOUT ("I-block with wrong seqno received\n");
return CCID_DRIVER_ERR_CARD_IO_ERROR;
}
@@ -3603,7 +3603,7 @@ ccid_transceive_secure (ccid_driver_t handle,
return CCID_DRIVER_ERR_CARD_IO_ERROR;
}
else if (!!(tpdu[1] & 0x10) == handle->t1_ns)
- { /* Reponse does not match our sequence number. */
+ { /* Response does not match our sequence number. */
DEBUGOUT ("R-block with wrong seqno received on more bit\n");
return CCID_DRIVER_ERR_CARD_IO_ERROR;
}
diff --git a/scd/command.c b/scd/command.c
index a7033e856..ba830dec8 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -529,7 +529,7 @@ open_card (ctrl_t ctrl, const char *apptype)
static const char hlp_serialno[] =
"SERIALNO [<apptype>]\n"
"\n"
- "Return the serial number of the card using a status reponse. This\n"
+ "Return the serial number of the card using a status response. This\n"
"function should be used to check for the presence of a card.\n"
"\n"
"If APPTYPE is given, an application of that type is selected and an\n"
@@ -1147,7 +1147,7 @@ static const char hlp_getattr[] =
"returned through status message, see the LEARN command for details.\n"
"\n"
"However, the current implementation assumes that Name is not escaped;\n"
- "this works as long as noone uses arbitrary escaping. \n"
+ "this works as long as no one uses arbitrary escaping. \n"
"\n"
"Note, that this function may even be used on a locked card.";
static gpg_error_t
@@ -1185,7 +1185,7 @@ static const char hlp_setattr[] =
"application. NAME and VALUE must be percent and '+' escaped.\n"
"\n"
"However, the current implementation assumes that NAME is not\n"
- "escaped; this works as long as noone uses arbitrary escaping.\n"
+ "escaped; this works as long as no one uses arbitrary escaping.\n"
"\n"
"A PIN will be requested for most NAMEs. See the corresponding\n"
"setattr function of the actually used application (app-*.c) for\n"
@@ -1487,7 +1487,7 @@ static const char hlp_passwd[] =
"PASSWD [--reset] [--nullpin] <chvno>\n"
"\n"
"Change the PIN or, if --reset is given, reset the retry counter of\n"
- "the card holder verfication vector CHVNO. The option --nullpin is\n"
+ "the card holder verification vector CHVNO. The option --nullpin is\n"
"used for TCOS cards to set the initial PIN. The format of CHVNO\n"
"depends on the card application.";
static gpg_error_t
@@ -1837,7 +1837,7 @@ static const char hlp_apdu[] =
" S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1\n"
"\n"
"Using the option --more handles the card status word MORE_DATA\n"
- "(61xx) and concatenates all reponses to one block.\n"
+ "(61xx) and concatenates all responses to one block.\n"
"\n"
"Using the option \"--exlen\" the returned APDU may use extended\n"
"length up to N bytes. If N is not given a default value is used\n"
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 3c43a4c81..515e21fe6 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -291,7 +291,7 @@ iso7816_verify_kp (int slot, int chvno, pininfo_t *pininfo)
}
/* Perform a VERIFY command on SLOT using the card holder verification
- vector CHVNO with a CHV of lenght CHVLEN. Returns 0 on success. */
+ vector CHVNO with a CHV of length CHVLEN. Returns 0 on success. */
gpg_error_t
iso7816_verify (int slot, int chvno, const char *chv, size_t chvlen)
{