diff options
author | Justus Winter <[email protected]> | 2015-11-16 11:41:46 +0000 |
---|---|---|
committer | Justus Winter <[email protected]> | 2015-11-17 11:50:22 +0000 |
commit | a9e0905342e847e8961ec4fe9b3aaedf05e33423 (patch) | |
tree | 213c99f194fda980f1ea41ad669463d707501e94 /scd | |
parent | gpg: Fix error checking and improve error reporting. (diff) | |
download | gnupg-a9e0905342e847e8961ec4fe9b3aaedf05e33423.tar.gz gnupg-a9e0905342e847e8961ec4fe9b3aaedf05e33423.zip |
Fix typos found using codespell.
* agent/cache.c: Fix typos.
* agent/call-pinentry.c: Likewise.
* agent/call-scd.c: Likewise.
* agent/command-ssh.c: Likewise.
* agent/command.c: Likewise.
* agent/divert-scd.c: Likewise.
* agent/findkey.c: Likewise.
* agent/gpg-agent.c: Likewise.
* agent/w32main.c: Likewise.
* common/argparse.c: Likewise.
* common/audit.c: Likewise.
* common/audit.h: Likewise.
* common/convert.c: Likewise.
* common/dotlock.c: Likewise.
* common/exechelp-posix.c: Likewise.
* common/exechelp-w32.c: Likewise.
* common/exechelp-w32ce.c: Likewise.
* common/exechelp.h: Likewise.
* common/helpfile.c: Likewise.
* common/i18n.h: Likewise.
* common/iobuf.c: Likewise.
* common/iobuf.h: Likewise.
* common/localename.c: Likewise.
* common/logging.c: Likewise.
* common/openpgp-oid.c: Likewise.
* common/session-env.c: Likewise.
* common/sexputil.c: Likewise.
* common/sysutils.c: Likewise.
* common/t-sexputil.c: Likewise.
* common/ttyio.c: Likewise.
* common/util.h: Likewise.
* dirmngr/cdblib.c: Likewise.
* dirmngr/certcache.c: Likewise.
* dirmngr/crlcache.c: Likewise.
* dirmngr/dirmngr-client.c: Likewise.
* dirmngr/dirmngr.c: Likewise.
* dirmngr/dirmngr_ldap.c: Likewise.
* dirmngr/dns-stuff.c: Likewise.
* dirmngr/http.c: Likewise.
* dirmngr/ks-engine-hkp.c: Likewise.
* dirmngr/ks-engine-ldap.c: Likewise.
* dirmngr/ldap-wrapper.c: Likewise.
* dirmngr/ldap.c: Likewise.
* dirmngr/misc.c: Likewise.
* dirmngr/ocsp.c: Likewise.
* dirmngr/validate.c: Likewise.
* g10/encrypt.c: Likewise.
* g10/getkey.c: Likewise.
* g10/gpg.c: Likewise.
* g10/gpgv.c: Likewise.
* g10/import.c: Likewise.
* g10/keydb.c: Likewise.
* g10/keydb.h: Likewise.
* g10/keygen.c: Likewise.
* g10/keyid.c: Likewise.
* g10/keylist.c: Likewise.
* g10/keyring.c: Likewise.
* g10/mainproc.c: Likewise.
* g10/misc.c: Likewise.
* g10/options.h: Likewise.
* g10/packet.h: Likewise.
* g10/parse-packet.c: Likewise.
* g10/pkclist.c: Likewise.
* g10/pkglue.c: Likewise.
* g10/plaintext.c: Likewise.
* g10/server.c: Likewise.
* g10/sig-check.c: Likewise.
* g10/sqlite.c: Likewise.
* g10/tdbio.c: Likewise.
* g10/test-stubs.c: Likewise.
* g10/tofu.c: Likewise.
* g10/trust.c: Likewise.
* g10/trustdb.c: Likewise.
* g13/create.c: Likewise.
* g13/mountinfo.c: Likewise.
* kbx/keybox-blob.c: Likewise.
* kbx/keybox-file.c: Likewise.
* kbx/keybox-init.c: Likewise.
* kbx/keybox-search-desc.h: Likewise.
* kbx/keybox-search.c: Likewise.
* kbx/keybox-update.c: Likewise.
* scd/apdu.c: Likewise.
* scd/app-openpgp.c: Likewise.
* scd/app-p15.c: Likewise.
* scd/app.c: Likewise.
* scd/ccid-driver.c: Likewise.
* scd/command.c: Likewise.
* scd/iso7816.c: Likewise.
* sm/base64.c: Likewise.
* sm/call-agent.c: Likewise.
* sm/call-dirmngr.c: Likewise.
* sm/certchain.c: Likewise.
* sm/gpgsm.c: Likewise.
* sm/import.c: Likewise.
* sm/keydb.c: Likewise.
* sm/minip12.c: Likewise.
* sm/qualified.c: Likewise.
* sm/server.c: Likewise.
* tools/gpg-check-pattern.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgkey2ssh.c: Likewise.
* tools/gpgparsemail.c: Likewise.
* tools/gpgtar.c: Likewise.
* tools/rfc822parse.c: Likewise.
* tools/symcryptrun.c: Likewise.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | scd/apdu.c | 10 | ||||
-rw-r--r-- | scd/app-openpgp.c | 8 | ||||
-rw-r--r-- | scd/app-p15.c | 2 | ||||
-rw-r--r-- | scd/app.c | 2 | ||||
-rw-r--r-- | scd/ccid-driver.c | 8 | ||||
-rw-r--r-- | scd/command.c | 10 | ||||
-rw-r--r-- | scd/iso7816.c | 2 |
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. */ @@ -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) { |