mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
all: fix spelling and typos
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
parent
ef540d1af0
commit
54eb375ff1
77 changed files with 120 additions and 120 deletions
|
@ -1,4 +1,4 @@
|
|||
/* armor.c - Armor flter
|
||||
/* armor.c - Armor filter
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
* 2007 Free Software Foundation, Inc.
|
||||
*
|
||||
|
|
|
@ -1083,7 +1083,7 @@ ks_put_inq_cb (void *opaque, const char *line)
|
|||
|
||||
/* Send a key to the configured server. {DATA,DATLEN} contains the
|
||||
key in OpenPGP binary transport format. If KEYBLOCK is not NULL it
|
||||
has the internal representaion of that key; this is for example
|
||||
has the internal representation of that key; this is for example
|
||||
used to convey meta data to LDAP keyservers. */
|
||||
gpg_error_t
|
||||
gpg_dirmngr_ks_put (ctrl_t ctrl, void *data, size_t datalen, kbnode_t keyblock)
|
||||
|
|
|
@ -648,7 +648,7 @@ current_card_status (ctrl_t ctrl, estream_t fp,
|
|||
info.fpr3len? info.fpr3 : NULL);
|
||||
thefprlen = (info.fpr1len? info.fpr1len : info.fpr2len? info.fpr2len :
|
||||
info.fpr3len? info.fpr3len : 0);
|
||||
/* If the fingerprint is all 0xff, the key has no asssociated
|
||||
/* If the fingerprint is all 0xff, the key has no associated
|
||||
OpenPGP certificate. */
|
||||
if ( thefpr && !fpr_is_ff (thefpr, thefprlen)
|
||||
&& !get_pubkey_byfprint (ctrl, pk, &keyblock, thefpr, thefprlen))
|
||||
|
|
|
@ -187,7 +187,7 @@ write_status_text (int no, const char *text)
|
|||
}
|
||||
|
||||
|
||||
/* Write a status line with code NO followed by the outout of the
|
||||
/* Write a status line with code NO followed by the output of the
|
||||
* printf style FORMAT. The caller needs to make sure that LFs and
|
||||
* CRs are not printed. */
|
||||
void
|
||||
|
|
|
@ -42,7 +42,7 @@ static int decode_filter ( void *opaque, int control, IOBUF a,
|
|||
/* Our context object. */
|
||||
struct decode_filter_context_s
|
||||
{
|
||||
/* Recounter (max value is 2). We need it becuase we do not know
|
||||
/* Recounter (max value is 2). We need it because we do not know
|
||||
* whether the iobuf or the outer control code frees this object
|
||||
* first. */
|
||||
int refcount;
|
||||
|
|
|
@ -732,7 +732,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
|
|||
|
||||
/* In case 3DES has been selected, print a warning if any key
|
||||
does not have a preference for AES. This should help to
|
||||
indentify why encrypting to several recipients falls back to
|
||||
identify why encrypting to several recipients falls back to
|
||||
3DES. */
|
||||
if (opt.verbose && cfx.dek->algo == CIPHER_ALGO_3DES)
|
||||
warn_missing_aes_from_pklist (pk_list);
|
||||
|
@ -1003,7 +1003,7 @@ encrypt_filter (void *opaque, int control,
|
|||
|
||||
/* In case 3DES has been selected, print a warning if
|
||||
any key does not have a preference for AES. This
|
||||
should help to indentify why encrypting to several
|
||||
should help to identify why encrypting to several
|
||||
recipients falls back to 3DES. */
|
||||
if (opt.verbose
|
||||
&& efx->cfx.dek->algo == CIPHER_ALGO_3DES)
|
||||
|
|
|
@ -1179,7 +1179,7 @@ print_status_exported (PKT_public_key *pk)
|
|||
* passphrase-protected. Otherwise, store secret key material in the
|
||||
* clear.
|
||||
*
|
||||
* CACHE_NONCE_ADDR is used to share nonce for multple key retrievals.
|
||||
* CACHE_NONCE_ADDR is used to share nonce for multiple key retrievals.
|
||||
*/
|
||||
gpg_error_t
|
||||
receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd,
|
||||
|
|
|
@ -60,7 +60,7 @@ struct getkey_ctx_s
|
|||
search or not. A search that is exact requires that a key or
|
||||
subkey meet all of the specified criteria. A search that is not
|
||||
exact allows selecting a different key or subkey from the
|
||||
keyblock that matched the critera. Further, an exact search
|
||||
keyblock that matched the criteria. Further, an exact search
|
||||
returns the key or subkey that matched whereas a non-exact search
|
||||
typically returns the primary key. See finish_lookup for
|
||||
details. */
|
||||
|
@ -3364,7 +3364,7 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock)
|
|||
*
|
||||
* 1. No requested usage and no primary key requested
|
||||
* Examples for this case are that we have a keyID to be used
|
||||
* for decrytion or verification.
|
||||
* for decryption or verification.
|
||||
* 2. No usage but primary key requested
|
||||
* This is the case for all functions which work on an
|
||||
* entire keyblock, e.g. for editing or listing
|
||||
|
|
|
@ -3891,7 +3891,7 @@ main (int argc, char **argv)
|
|||
keygen_set_std_prefs(pers_compress_list,PREFTYPE_ZIP))
|
||||
log_error(_("invalid personal compress preferences\n"));
|
||||
|
||||
/* Check chunk size. Please fix also the man page if you chnage
|
||||
/* Check chunk size. Please fix also the man page if you change
|
||||
* the default. The limits are given by the specs. */
|
||||
if (!opt.chunk_size)
|
||||
opt.chunk_size = 27; /* Default to the suggested max of 128 MiB. */
|
||||
|
@ -4875,9 +4875,9 @@ main (int argc, char **argv)
|
|||
|
||||
while( endless || count ) {
|
||||
byte *p;
|
||||
/* Wee need a multiple of 3, so that in case of
|
||||
/* We need a multiple of 3, so that in case of
|
||||
armored output we get a correct string. No
|
||||
linefolding is done, as it is best to levae this to
|
||||
linefolding is done, as it is best to leave this to
|
||||
other tools */
|
||||
size_t n = !endless && count < 99? count : 99;
|
||||
|
||||
|
|
|
@ -1812,7 +1812,7 @@ import_one (ctrl_t ctrl,
|
|||
}
|
||||
}
|
||||
|
||||
/* Delete invalid parts and without the drop otions bail out if
|
||||
/* Delete invalid parts and without the drop option bail out if
|
||||
* there are no user ids. */
|
||||
if (!delete_inv_parts (ctrl, keyblock, keyid, options)
|
||||
&& !(options & IMPORT_DROP_UIDS) )
|
||||
|
|
|
@ -500,7 +500,7 @@ clean_one_subkey_dupsigs (ctrl_t ctrl, kbnode_t subkeynode)
|
|||
log_debug ("\tchecking subkey %08lX for dupsigs\n",
|
||||
(ulong) keyid_from_pk (pk, NULL));
|
||||
|
||||
/* First check that the choosen flag has been set. Note that we
|
||||
/* First check that the chosen flag has been set. Note that we
|
||||
* only look at plain signatures so to keep all revocation
|
||||
* signatures which may carry important information. */
|
||||
for (node = subkeynode->next;
|
||||
|
@ -519,7 +519,7 @@ clean_one_subkey_dupsigs (ctrl_t ctrl, kbnode_t subkeynode)
|
|||
}
|
||||
|
||||
if (!any_choosen)
|
||||
return 0; /* Ooops no choosen flag set - we can't decide. */
|
||||
return 0; /* Ooops no chosen flag set - we can't decide. */
|
||||
|
||||
for (node = subkeynode->next;
|
||||
node && !(node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
||||
|
|
|
@ -450,7 +450,7 @@ keygen_set_std_prefs (const char *string,int personal)
|
|||
}
|
||||
|
||||
/* In case we have no compress algo at all, declare that
|
||||
we prefer no compresssion. */
|
||||
we prefer no compression. */
|
||||
if (!any_compress)
|
||||
strcat(dummy_string,"Z0 ");
|
||||
|
||||
|
|
|
@ -811,7 +811,7 @@ proc_plaintext( CTX c, PACKET *pkt )
|
|||
int any, clearsig, rc;
|
||||
kbnode_t n;
|
||||
|
||||
/* This is a literal data packet. Bumb a counter for later checks. */
|
||||
/* This is a literal data packet. Bump a counter for later checks. */
|
||||
literals_seen++;
|
||||
|
||||
if (pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8))
|
||||
|
|
|
@ -549,7 +549,7 @@ openpgp_cipher_blocklen (cipher_algo_t algo)
|
|||
|
||||
/****************
|
||||
* Wrapper around the libgcrypt function with additional checks on
|
||||
* the OpenPGP contraints for the algo ID.
|
||||
* the OpenPGP constraints for the algo ID.
|
||||
*/
|
||||
int
|
||||
openpgp_cipher_test_algo (cipher_algo_t algo)
|
||||
|
@ -712,7 +712,7 @@ openpgp_pk_test_algo2 (pubkey_algo_t algo, unsigned int use)
|
|||
#endif
|
||||
|
||||
case PUBKEY_ALGO_ELGAMAL:
|
||||
/* Dont't allow type 20 keys unless in rfc2440 mode. */
|
||||
/* Don't allow type 20 keys unless in rfc2440 mode. */
|
||||
if (RFC2440)
|
||||
ga = GCRY_PK_ELG;
|
||||
break;
|
||||
|
|
|
@ -2351,7 +2351,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
|
|||
{
|
||||
log_error ("packet(%d) too large\n", pkttype);
|
||||
if (list_mode)
|
||||
es_fputs (":key packet: [too larget]\n", listfp);
|
||||
es_fputs (":key packet: [too large]\n", listfp);
|
||||
err = gpg_error (GPG_ERR_INV_PACKET);
|
||||
goto leave;
|
||||
}
|
||||
|
@ -3180,7 +3180,7 @@ parse_plaintext (IOBUF inp, int pkttype, unsigned long pktlen,
|
|||
pt->name[i] = c;
|
||||
}
|
||||
/* Fill up NAME so that a check with valgrind won't complain about
|
||||
* reading from uninitalized memory. This case may be triggred by
|
||||
* reading from uninitialized memory. This case may be triggred by
|
||||
* corrupted packets. */
|
||||
for (; i < namelen; i++)
|
||||
pt->name[i] = 0;
|
||||
|
|
|
@ -95,7 +95,7 @@ encode_session_key (int openpgp_pk_algo, DEK *dek, unsigned int nbits)
|
|||
output be a multiple of 8 bytes. */
|
||||
if (openpgp_pk_algo == PUBKEY_ALGO_ECDH)
|
||||
{
|
||||
/* Pad to 8 byte granulatiry; the padding byte is the number of
|
||||
/* Pad to 8 byte granularity; the padding byte is the number of
|
||||
* padded bytes.
|
||||
*
|
||||
* A DEK(k bytes) CSUM(2 bytes) 0x 0x 0x 0x ... 0x
|
||||
|
@ -143,7 +143,7 @@ encode_session_key (int openpgp_pk_algo, DEK *dek, unsigned int nbits)
|
|||
*
|
||||
* 0 2 RND(i bytes) 0 A DEK(k bytes) CSUM(2 bytes)
|
||||
*
|
||||
* (But how can we store the leading 0 - the external representaion
|
||||
* (But how can we store the leading 0 - the external representation
|
||||
* of MPIs doesn't allow leading zeroes =:-)
|
||||
*
|
||||
* RND are (at least 1) non-zero random bytes.
|
||||
|
|
|
@ -53,7 +53,7 @@ static int recipient_digest_algo=0;
|
|||
|
||||
|
||||
/*
|
||||
* Create notations and other stuff. It is assumed that the stings in
|
||||
* Create notations and other stuff. It is assumed that the strings in
|
||||
* STRLIST are already checked to contain only printable data and have
|
||||
* a valid NAME=VALUE format.
|
||||
*/
|
||||
|
|
|
@ -106,7 +106,7 @@ struct cmp_xdir_struct
|
|||
static char *db_name;
|
||||
|
||||
/* The handle for locking the trustdb file and a counter to record how
|
||||
* often this lock has been taken. That counter is required becuase
|
||||
* often this lock has been taken. That counter is required because
|
||||
* dotlock does not implemen recursive locks. */
|
||||
static dotlock_t lockhandle;
|
||||
static unsigned int is_locked;
|
||||
|
@ -589,7 +589,7 @@ tdbio_update_version_record (ctrl_t ctrl)
|
|||
|
||||
/*
|
||||
* Create and write the trustdb version record.
|
||||
* This is called with the writelock activ.
|
||||
* This is called with the writelock active.
|
||||
* Returns: 0 on success or an error code.
|
||||
*/
|
||||
static int
|
||||
|
@ -1139,7 +1139,7 @@ upd_hashtable (ctrl_t ctrl, ulong table, byte *key, int keylen, ulong newrecnum)
|
|||
|
||||
if (rec.r.hlst.next)
|
||||
{
|
||||
/* read the next reord of the list. */
|
||||
/* read the next record of the list. */
|
||||
rc = tdbio_read_record (rec.r.hlst.next, &rec, RECTYPE_HLST);
|
||||
if (rc)
|
||||
{
|
||||
|
|
|
@ -1506,7 +1506,7 @@ store_validation_status (ctrl_t ctrl, int depth,
|
|||
/* Returns a sanitized copy of the regexp (which might be "", but not
|
||||
NULL). */
|
||||
#ifndef DISABLE_REGEX
|
||||
/* Operator charactors except '.' and backslash.
|
||||
/* Operator characters except '.' and backslash.
|
||||
See regex(7) on BSD. */
|
||||
#define REGEXP_OPERATOR_CHARS "^[$()|*+?{"
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ verify_signatures (ctrl_t ctrl, int nfiles, char **files )
|
|||
* we can do it is by reading one byte from stdin and then unget
|
||||
* it; the problem here is that we may be reading from the
|
||||
* terminal (which could be detected using isatty() but won't work
|
||||
* when under contol of a pty using program (e.g. expect)) and
|
||||
* when under control of a pty using program (e.g. expect)) and
|
||||
* might get us in trouble when stdin is used for another purpose
|
||||
* (--passphrase-fd 0). So we have to break with the behaviour
|
||||
* prior to gpg 1.0.4 by assuming that case 3 is a normal
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue