diff options
Diffstat (limited to 'scd')
-rw-r--r-- | scd/apdu.c | 4 | ||||
-rw-r--r-- | scd/app-openpgp.c | 4 | ||||
-rw-r--r-- | scd/app.c | 4 | ||||
-rw-r--r-- | scd/atr.c | 2 | ||||
-rw-r--r-- | scd/command.c | 2 | ||||
-rw-r--r-- | scd/iso7816.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 65f770dfd..97624ebad 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -94,7 +94,7 @@ struct reader_table_s { int used; /* True if slot is used. */ unsigned short port; /* Port number: 0 = unused, 1 - dev/tty */ - /* Function pointers intialized to the various backends. */ + /* Function pointers initialized to the various backends. */ int (*connect_card)(int); int (*disconnect_card)(int); int (*close_reader)(int); @@ -230,7 +230,7 @@ static npth_mutex_t reader_table_lock; #define PCSC_E_SERVICE_STOPPED 0x8010001E #define PCSC_W_REMOVED_CARD 0x80100069 -/* Fix pcsc-lite ABI incompatibilty. */ +/* Fix pcsc-lite ABI incompatibility. */ #ifndef SCARD_CTL_CODE #ifdef _WIN32 #include <winioctl.h> diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 66b235d81..25f3dbef5 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1588,7 +1588,7 @@ read_public_key (app_t app, ctrl_t ctrl, u32 created_at, int keyno, } -/* Get the public key for KEYNO and store it as an S-expresion with +/* Get the public key for KEYNO and store it as an S-expression 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 solely indicated by the @@ -1596,7 +1596,7 @@ read_public_key (app_t app, ctrl_t ctrl, u32 created_at, int keyno, Note that GnuPG 1.x does not need this and it would be too time consuming to send it just for the fun of it. However, given that we - use the same code in gpg 1.4, we can't use the gcry S-expresion + use the same code in gpg 1.4, we can't use the gcry S-expression here but need to open encode it. */ #if GNUPG_MAJOR_VERSION > 1 static gpg_error_t @@ -99,7 +99,7 @@ app_dump_state (void) npth_mutex_unlock (&app_list_lock); } -/* Check wether the application NAME is allowed. This does not mean +/* Check whether the application NAME is allowed. This does not mean we have support for it though. */ static int is_app_allowed (const char *name) @@ -939,7 +939,7 @@ app_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr, int reset_mode, /* Perform a VERIFY operation without doing anything lese. This may - be used to initialze a the PIN cache for long lasting other + be used to initialize a the PIN cache for long lasting other operations. Its use is highly application dependent. */ gpg_error_t app_check_pin (app_t app, ctrl_t ctrl, const char *keyidstr, @@ -1,4 +1,4 @@ -/* atr.c - ISO 7816 ATR fucntions +/* atr.c - ISO 7816 ATR functions * Copyright (C) 2003, 2011 Free Software Foundation, Inc. * * This file is part of GnuPG. diff --git a/scd/command.c b/scd/command.c index 56fdf7489..6bcbce4fc 100644 --- a/scd/command.c +++ b/scd/command.c @@ -445,7 +445,7 @@ cmd_learn (assuan_context_t ctx, char *line) xfree (serial); return rc; } - /* Not canceled, so we have to proceeed. */ + /* Not canceled, so we have to proceed. */ } xfree (serial); } diff --git a/scd/iso7816.c b/scd/iso7816.c index d146bd00a..081b0808c 100644 --- a/scd/iso7816.c +++ b/scd/iso7816.c @@ -204,7 +204,7 @@ iso7816_list_directory (int slot, int list_dirs, } -/* This funcion sends an already formatted APDU to the card. With +/* This function sends an already formatted APDU to the card. With HANDLE_MORE set to true a MORE DATA status will be handled internally. The return value is a gpg error code (i.e. a mapped status word). This is basically the same as apdu_send_direct but |