Commit 700c438d authored by Werner Koch's avatar Werner Koch

applied Mathews typo and grammar fixes

parent 3c7368a3
Tue Apr 14 19:08:05 1998 Werner Koch (wk@isil.d.shuttle.de)
* [all files]: Applied Matthew Skala's typo and grammar fixes.
Wed Mar 4 10:32:40 1998 Werner Koch (wk@isil.d.shuttle.de)
* configure.in (getrusage,gettimeofday): New tests.
......
......@@ -7,7 +7,7 @@ Configure options for GNUPG
--with-included-zlib Forces usage of the local zlib sources. Default is
to use the (shared) library of the system.
--with-included-gettext Forces usage of the local gettext sources instead of.
--with-included-gettext Forces usage of the local gettext sources instead of
the one provided by your system.
--disable-nls Disable NLS support (See ABOUT-NLS)
......@@ -32,12 +32,12 @@ Problems
If you have compile problems, try the configure options "--with-included-zlib"
or "--disable-nls" (See ABOUT-NLS).
I cant check all assembler files; so if you have problems assembling them
I can't check all assembler files, so if you have problems assembling them
(or the program crashes), simply delete the files in the mpi/<cpu> directory.
The configure scripts may consider several subdirectories to get all
available assembler files; be sure to delete the correct ones. The
assembler replacements are in C and in mpi/generic; never delete udiv-qrnnd.S
in any CPU directory, because there maybe no C substitute.
in any CPU directory, because there may be no C substitute.
Don't forget to delete "config.cache" and run "./config.status --recheck".
......
......@@ -5,7 +5,7 @@
THIS IS ALPHA SOFTWARE, YOU MAY ENCOUNTER SOOME BUGS.
On a Linux box (version 2.x.x, alpha or x86 CPU) it should
work reliable. You may create your key on such a machine and
work reliably. You may create your key on such a machine and
use it. Please verify the tar file; there is a PGP and a GNUPG
signature available. My PGP key is well known and published in
the "Global Trust Register for 1998", ISBN 0-9532397-0-5.
......@@ -25,14 +25,14 @@
See the file COPYING for copyright and warranty information.
Due to the fact that GNUPG does not use use any patented algorithm,
it cannot be compatible to old PGP versions, because those use
IDEA (which is worldwide patented) and RSA (which is patented in
it cannot be compatible with old PGP versions, because those use
IDEA (which is patented worldwide) and RSA (which is patented in
the United States until Sep 20, 2000). I'm sorry about this, but
this is the world we have created (e.g. by using proprietary software).
Because the OpenPGP standard is still a draft, GNUPG is not yet
compatible to it (or PGP 5) - but it will. The data structures
used are compatible with PGP 2.x, so it can parse an list such files
compatible with it (or PGP 5) - but it will be. The data structures
used are compatible with PGP 2.x, so it can parse and list such files
and PGP should be able to parse data created by GNUPG and complain
about unsupported algorithms.
......@@ -40,9 +40,9 @@
encryption and signing; Blowfish with a 160 bit key for protecting
the secret-key components, conventional and session encryption;
RIPE MD-160 to create message digest. DSA, SHA-1 and CAST are
also implemented, but not used on default. I decided not
to use DSA as default signing algorithm, because it allows only for
1024 bit keys and this may be not enough in a couple of years.
also implemented, but not used by default. I decided not
to use DSA as the default signing algorithm, because it allows only
for 1024 bit keys and this may not be enough in a couple of years.
......@@ -70,16 +70,16 @@
This asks some questions and then starts key generation. To create
good random numbers for prime number generation, it uses a /dev/random
which will emit only bytes if the kernel can gather enough entropy.
which will only emit bytes if the kernel can gather enough entropy.
If you see no progress, you should start some other activities such
as mouse moves, "find /" or using the keyboard (on another window).
Because we have no hardware device to generate random we have to use
this method.
as mouse moves, "find /" or using the keyboard (in another window).
Because we have no hardware device to generate randomness we have to
use this method.
Key generation shows progress by printing different characters to
stderr:
"." Last 10 Miller-Rabin tests failed.
"+" Miller-Rabin test succeeded.
"." Last 10 Miller-Rabin tests failed
"+" Miller-Rabin test succeeded
"!" Reloading the pool with fresh prime numbers
"^" Checking a new value for the generator
"<" Size of one factor decreased
......@@ -87,10 +87,10 @@
The prime number for ElGamal is generated this way:
1) Make a prime number q of 160, 200, 240 bits (depending on the keysize).
1) Make a prime number q of 160, 200, 240 bits (depending on the keysize)
2) Select the length of the other prime factors to be at least the size
of q and calculate the number of prime factors needed
3) Make a pool of prime number, each of the length determined in step 2
3) Make a pool of prime numbers, each of the length determined in step 2
4) Get a new permutation out of the pool or continue with step 3
if we have tested all permutations.
5) Calculate a candidate prime p = 2 * q * p[1] * ... * p[n] + 1
......@@ -121,12 +121,12 @@
This let you sign the key of of "Donald" with the userids of "Karl"
and "Joe".
All existing signatures are checked, if some are invalid, a menu is
offered to delete some of them, and the you are asked for every user
wether you want to sign this key.
All existing signatures are checked; if some are invalid, a menu is
offered to delete some of them, and then you are asked for every user
whether you want to sign this key.
You may remove a signature at any time using the option "--edit-sig",
which asks for the sigs to remove. Self-signatures are not removable.
which asks for the sigs to remove. Self-signatures are not removable.
......@@ -253,7 +253,7 @@
Batch mode
----------
If you use the option "--batch", GNUPG runs in non-interactive mode and
never prompts for input data. This even does not allow to enter
never prompts for input data. This does not even allow entering the
passphrase; until we have a better solution (something like ssh-agent),
you can use the option "--passhrase-fd n", which works like PGPs
PGPPASSFD.
......@@ -267,7 +267,7 @@
GNUPG returns with an exit status of 1 if in batch mode and a bad signature
has been detected or 2 or higher for all other errors. You should parse
stderr or the output of the fd specified with --status-fd to get detailed
informations about the errors.
information about the errors.
Esoteric commands
......@@ -291,7 +291,7 @@
List the possible trust paths for the given username, up to the specified
depth. If depth is negative, duplicate introducers are not listed,
because those would increase the trust probabilty only minimal.
because those would increase the trust probability only minimally.
(you must use the special option "--" to stop option parsing when
using a negative number). This option may create new entries in the
trustdb.
......@@ -307,7 +307,7 @@
gpgm --gen-prime n q
Generate a prime number suitable for ElGamal signatures of size n with
a q as largest primefactor of n-1.
a q as largest prime factor of n-1.
gpgm --gen-prime n q 1
......@@ -319,7 +319,7 @@
Debug Flags
-----------
Use the option "--debug n" to output debug informations. This option
Use the option "--debug n" to output debug information. This option
can be used multiple times, all values are ORed; n maybe prefixed with
0x to use hex-values.
......@@ -339,7 +339,7 @@
Other Notes
-----------
This is work in progress, so you may find duplicated code fragments,
ugly data structures, weird usage of filenames and other thinks.
ugly data structures, weird usage of filenames and other things.
I will run "indent" over the source when making a real distribution,
but for now I stick to my own formatting rules.
......
GNUPG has originally been written by Werner Koch. Other people contributed
by reporting problems, suggesting various improvements or submitting actual
code. Here is a list of these people. Help me keeping it complete and
exempt of errors.
GNUPG was originally written by Werner Koch. Other people contributed by
reporting problems, suggesting various improvements or submitting actual
code. Here is a list of those people. Help me keep it complete and free of
errors.
Anand Kumria wildfire@progsoc.uts.edu.au
Daniel Eisenbud eisenbud@cs.swarthmore.edu
......@@ -16,6 +15,7 @@ Jens Bachem bachem@rrz.uni-koeln.de
Marco d'Itri md@linux.it
Mark Adler madler@alumni.caltech.edu
Martin Schulte schulte@thp.uni-koeln.de
Matthew Skala mskala@ansuz.sooke.bc.ca
Peter Gutmann pgut001@cs.auckland.ac.nz
Ralph Gillen gillen@theochem.uni-duesseldorf.de
Thomas Roessler roessler@guug.de
......@@ -25,7 +25,6 @@ Walter Koch walterk@ddorf.rhein-ruhr.de
Werner Koch werner.koch@guug.de
Wim Vandeputte bunbun@reptile.rug.ac.be
Thanks to the German Unix User Group for providing FTP space and
Martin Hamilton for hosting the mailing list.
......
......@@ -10,7 +10,7 @@ define(WK_MSG_PRINT,
dnl WK_CHECK_TYPEDEF(TYPE, HAVE_NAME)
dnl Check wether a typedef exists and create a #define $2 if it exists
dnl Check whether a typedef exists and create a #define $2 if it exists
dnl
AC_DEFUN(WK_CHECK_TYPEDEF,
[ AC_MSG_CHECKING(for $1 typedef)
......
......@@ -3,7 +3,7 @@
. defs.inc || exit 3
#info Checking cleartext signatures
# There is a minor glitch, which appends a lf to the cleartext.
# There is a minor glitch, which appends an lf to the cleartext.
# I do not consider that a bug, but I have to use the head .. mimic.
# It is not clear what should happen to leading LFs, we must
# change the defintion of cleartext, so that only 1 empty line
......
......@@ -408,7 +408,7 @@ cipher_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
/****************
* Used for PGP's somewhat strange CFB mode. Does only work if
* Used for PGP's somewhat strange CFB mode. Only works if
* the handle is in PHILS_CFB mode
*/
void
......
......@@ -75,7 +75,7 @@ dsa_free_secret_key( DSA_secret_key *sk )
/****************
* Test wether the secret key is valid.
* Test whether the secret key is valid.
* Returns: if this is a valid key.
*/
int
......
......@@ -203,7 +203,7 @@ elg_generate( ELG_public_key *pk, ELG_secret_key *sk,
/****************
* Test wether the secret key is valid.
* Test whether the secret key is valid.
* Returns: if this is a valid key.
*/
int
......@@ -320,7 +320,7 @@ elg_sign(MPI a, MPI b, MPI input, ELG_secret_key *skey )
/****************
* Returns true if the signature composed from A and B is valid.
* Returns true if the signature composed of A and B is valid.
*/
int
elg_verify(MPI a, MPI b, MPI input, ELG_public_key *pkey )
......
......@@ -107,9 +107,9 @@ transform( MD5_CONTEXT *ctx, const void *buffer, size_t len )
u32 D_save = D;
/* First round: using the given function, the context and a constant
the next context is computed. Because the algorithms processing
unit is a 32-bit word and it is determined to work on words in
little endian byte order we perhaps have to change the byte order
the next context is computed. Because the algorithm's processing
unit is a 32-bit word, and it is determined to work on words in
little endian byte order, we perhaps have to change the byte order
before the computation. To reduce the work for the next steps
we store the swapped words in the array CORRECT_WORDS. */
......@@ -127,7 +127,7 @@ transform( MD5_CONTEXT *ctx, const void *buffer, size_t len )
cyclic rotation. Hope the C compiler is smart enough. */
#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
/* Before we start, one word to the strange constants.
/* Before we start, one word about the strange constants.
They are defined in RFC 1321 as
T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
......
......@@ -327,7 +327,7 @@ gen_prime( unsigned nbits, int secret, int randomlevel )
}
/****************
* Returns: true if this is may me a prime
* Returns: true if this may be a prime
*/
static int
check_prime( MPI prime )
......@@ -365,7 +365,7 @@ check_prime( MPI prime )
/****************
* Return true if n is propably a prime
* Return true if n is probably a prime
*/
static int
is_prime( MPI n, int steps, int *count )
......
......@@ -134,7 +134,7 @@ quick_random_gen( int onoff )
/****************
* Fill the buffer with LENGTH bytes of cryptologic strong
* Fill the buffer with LENGTH bytes of cryptographically strong
* random bytes. level 0 is not very strong, 1 is strong enough
* for most usage, 2 is good for key generation stuff but may be very slow.
*/
......
/* sha1.c - SHA1 hash function
* Copyright (C) 1998 Free Software Foundation, Inc.
*
* Please see below for more legal informations!
* Please see below for more legal information!
*
* This file is part of GNUPG.
*
......
......@@ -24,7 +24,7 @@
#include "util.h"
#include "types.h"
/* Note: 2 is not included because it can be testest more easily
/* Note: 2 is not included because it can be tested more easily
* by looking at bit 0. The last entry in this list is marked by a zero
*/
ushort
......
......@@ -137,7 +137,7 @@ AC_CHECK_FUNCS(gettimeofday getrusage)
dnl check wether we have a random device
dnl check whether we have a random device
AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
[if test -c /dev/random && test -c /dev/urandom ; then
ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
......
......@@ -6,7 +6,7 @@
a rmd160 hash value from it. This is used as the
fingerprint and the low 64 bits are the keyid.
* Revocation certificates consists only of the signature packet;
* Revocation certificates consist only of the signature packet;
"import" knows how to handle this. The rationale behind it is
to keep them small.
......@@ -17,7 +17,7 @@ Layout of the TrustDB
=====================
FIXME: use a directory record as top node instead of the pubkey record
The TrustDB is build from fixed length records, where the first bytes
The TrustDB is built from fixed length records, where the first byte
describes the record type. All numeric values are stored in network
byte order. The length of each record is 40 bytes. The first record of
the DB is always of type 1 and this is the only record of this type.
......@@ -29,7 +29,7 @@ Record type 0:
Record type 1:
--------------
Version information for this TrustDB. This is always the first
record of the DB and the onyl one with type 1.
record of the DB and the only one with type 1.
1 byte value 1
3 bytes 'gpg' magic value
1 byte Version of the TrustDB
......@@ -74,7 +74,7 @@ Record type 3:
1 byte reserved
1 u32 owner This is used to bind all records for
a given certificate together. It is valid only in this TrustDB
and usefull if we have duplicate keyids
and useful if we have duplicate keyids
It points back to the directory node.
1 byte pubkey algorithm
1 byte reserved
......@@ -86,7 +86,7 @@ Record type 3:
Record type 4: (cache record)
--------------
Used to bind the trustDB to the concrete instance of keyblock in
a pubring. This is used to cache informations.
a pubring. This is used to cache information.
1 byte value 4
1 byte reserved
......@@ -132,14 +132,14 @@ Record Type 6 (hash table)
-------------
Due to the fact that we use the keyid to lookup keys, we can
implement quick access by some simple hash methods, and avoid
the overhead gdbm. A property of keyids is that they can be
used directly as hash value (They can be considered as strong
random numbers.
the overhead of gdbm. A property of keyids is that they can be
used directly as hash values. (They can be considered as strong
random numbers.)
What we use is a dynamic multilevel architecture, which combines
Hashtables, record lists, and linked list.
Hashtables, record lists, and linked lists.
This record is a hashtable of 256 entries; a special property
is, that all these records are adjacent stored to make up one
is that all these records are stored consecutively to make one
big table. The hash value is simple the 1st, 2nd, ... byte of
the keyid (depending on the indirection level).
......@@ -154,15 +154,15 @@ Record Type 6 (hash table)
which is 29 for a record length of 40.
To look up a key we use its lsb to get the recnum from this
hashtable and look up this addressed record:
hashtable and look up the addressed record:
- If this record is another hashtable, we use 2nd lsb
to index this hast table and so on.
- if this record is of hashlist, we lwalk thru these
reclist record until we found one whos hash fields
- if this record is a hashlist, we walk thru the
reclist records until we found one whose hash field
matches the MSB of our keyid, and lookup this record
- if this record is a dir record, we compare the
keyid and if this is correct, we get the keyrecod and compare
the fingerprint to decide wether it is the requested key;
the fingerprint to decide whether it is the requested key;
if this is not the correct dir record, we look at the next
dir record which is linked by the link field.
......@@ -185,8 +185,8 @@ Record type 7 (hash list)
Packet Headers
===============
GNUPG uses PGP 2 packet headers and also understand OpenPGP packet header.
There is one enhavement used ith the old style packet headers:
GNUPG uses PGP 2 packet headers and also understands OpenPGP packet header.
There is one enhancement used with the old style packet headers:
CTB bits 10, the "packet-length length bits", have values listed in
the following table:
......
......@@ -8,14 +8,14 @@ B<gpg> [--homedir name] [--options file] [options] command [args]
=head1 DESCRIPTION
This is the main program from the GNUPG system.
This is the main program for the GNUPG system.
=head1 COMMANDS
B<gpg> recognizes these commands:
B<-s>, B<--sign>
Make a signature. This option maybe combined
Make a signature. This option may be combined
with B<--encrypt>.
B<--clearsign>
......@@ -28,7 +28,7 @@ B<-e>, B<--encrypt>
Encrypt data. This option may be combined with B<--sign>.
B<-c>, B<--symmetric>
Encrypt only with symmetric cipher
Encrypt with symmetric cipher only
This command asks for a passphrase.
B<--store>
......@@ -39,8 +39,8 @@ B<--decrypt> [I<file>]
write it to stdout (or the file specified with
B<--output>). If the decrypted file is signed, the
signature is also verified. This command differs
from the default operation, as it never write to the
filename which is included in the file and that it
from the default operation, as it never writes to the
filename which is included in the file and it
rejects files which don't begin with an encrypted
message.
......@@ -49,27 +49,27 @@ B<--verify> [[I<sigfile>] {I<signed-files>}]
without generating any output. With no arguments,
the signature packet is read from stdin (it may be a
detached signature when not used in batch mode). If
only a sigfile is given, is maybe a complete signature
or a detached signature in which case the signed stuff
only a sigfile is given, it may be a complete signature
or a detached signature, in which case the signed stuff
is expected from stdin. With more than 1 argument, the
first should be a detached signature and the remaining
files are the signed stuff.
B<-k> [I<username>] [I<keyring>]
Kludge to be somewhat compatibe to PGP.
Without arguments, all public key-rings are listed,
with one argument, only I<keyring> is listed.
Kludge to be somewhat compatible with PGP.
Without arguments, all public key-rings are listed.
With one argument, only I<keyring> is listed.
Special combinations are also allowed, but it may
give starnge results when combined with more options.
give strange results when combined with more options.
B<-kv> Same as B<-k>
B<-kvv> List the signatures with every key.
B<-kvvv> Additional check all signatures.
B<-kvvv> Additionally check all signatures.
B<-kvc> List fingerprints
B<-kvvc> List fingerprints and signatures
B<--list-keys> [I<names>]
List all keys from the default public keyring or just the ones
given on the commandline.
List all keys from the default public keyring, or just the ones
given on the command line.
B<--list-sigs> [I<names>]
Same as B<--list-keys>, but the signatures are listed too.
......@@ -97,8 +97,8 @@ B<--sign-key> I<name>
all existing signatures of this key. If the key is
not yet signed by the default user (or the users given
with B<-u>), the program displays the information of
the key again, together with it's fingerprint and
asked whether it should be signed. This question
the key again, together with its fingerprint and
asks whether it should be signed. This question
is repeated for all users specified with B<-u>.
The key is then signed and the keyring which
contains the key is updated.
......@@ -121,7 +121,7 @@ B<--gen-revoke>
B<--export> [I<names>]
Either export all keys from all key-rings (default
key-rings and those registered via option B<--keyring>,
key-rings and those registered via option B<--keyring>),
or if at least one name is given, those of the given
name. The new keyring is written to F<stdout> or to
the file given with option "output". Use together
......@@ -135,8 +135,8 @@ B<--import>
Long options can be put in an options file (default F<~/.gnupg/options>);
do not write the 2 dashes, but simply the name of the option and any
arguments if required, lines with a hash as the first non-white-space
character are ignored. Commands maybe put in this file too, but that
arguments if required. Lines with a hash as the first non-white-space
character are ignored. Commands may be put in this file too, but that
does not make sense.
B<gpg> recognizes these options:
......@@ -159,8 +159,8 @@ B<-r> I<name>, B<--remote-user> I<name>
so that it can be used in an options file.
B<-v>, B<--verbose>
Give more informations during processing. If used
2 times, the input data is listed in detail.
Give more information during processing. If used
twice, the input data is listed in detail.
B<-z> I<n>
......@@ -229,7 +229,7 @@ B<--no-comment>
Do not write comment packets.
B<--completes-needed> I<n>
Number of completey trusted users to introduce a new
Number of completely trusted users to introduce a new
key signator (defaults to 1).
B<--marginals-needed> I<n>
......@@ -238,17 +238,17 @@ B<--marginals-needed> I<n>
B<--cipher-algo> I<name>
Use I<name> as cipher algorithm. Running the program
with the option B<--verbose> yields a list off supported
with the option B<--verbose> yields a list of supported
algorithms.
B<--pubkey-algo> I<name>
Use I<name> as puplic key algorithm. Running the program
with the option B<--verbose> yields a list off supported
with the option B<--verbose> yields a list of supported
algorithms.
B<--digest-algo> I<name>
Use I<name> as message digest algorithm. Running the
program with the option B<--verbose> yields a list off
program with the option B<--verbose> yields a list of
supported algorithms.
B<--passphrase-fd> I<n>
......
# This is a sample option file
#
# Unless you you specify which option file to use with the
# commandline option "--options filename", gpg uses per
# default the file ~/.gnupg/options.
# commandline option "--options filename", gpg uses the
# file ~/.gnupg/options by default.
#
# An option file can contain all long options which are
# available in GNUPG. If the first non white space character of
......@@ -17,7 +17,7 @@
#-----------------------------------------------
#------------------- Commands ------------------
#-----------------------------------------------
# With some expections, those cannot be combined
# With some expections, these cannot be combined
gen-prime
# Generate a prime.
......
......@@ -80,7 +80,7 @@ typedef enum {
/* if we encounter this armor string with this index, go
* into a mode, which fakes packets and wait for the next armor */
* into a mode which fakes packets and wait for the next armor */
#define BEGIN_SIGNED_MSG_IDX 3
static char *head_strings[] = {
"BEGIN PGP MESSAGE",
......@@ -136,7 +136,7 @@ initialize(void)
}
/****************
* Check wether this is a armored file or not
* Check whether this is an armored file or not
* See also parse-packet.c for details on this code
* Returns: True if it seems to be armored
*/
......@@ -167,7 +167,7 @@ is_armored( byte *buf )
/****************
* Try to check wether the iobuf is armored
* Try to check whether the iobuf is armored
* Returns true if this may be the case; the caller should use the
* filter to do further processing.
*/
......@@ -179,7 +179,7 @@ use_armor_filter( IOBUF a )
n = iobuf_peek(a, buf, 1 );
if( n == -1 )
return 0; /* EOF, doesn't matter wether armored or not */
return 0; /* EOF, doesn't matter whether armored or not */
if( !n )
return 1; /* can't check it: try armored */
return is_armored(buf);
......@@ -197,11 +197,11 @@ invalid_armor(void)
/****************
* check wether the armor header is valid on a signed message.
* check whether the armor header is valid on a signed message.
* this is for security reasons: the header lines are not included in the
* hash and by using some creative formatting rules, Mallory could fake
* any text at the beginning of a document; assuming it is read with
* a simple viewer. We do only allow the Hash Header.
* a simple viewer. We only allow the Hash Header.
*/
static int
parse_hash_header( const char *line )
......@@ -268,7 +268,7 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
do {
switch( state ) {
case fhdrHASArmor:
/* read at least the first byte to check wether it is armored
/* read at least the first byte to check whether it is armored
* or not */
c = 0;
for(n=0; n < 28 && (c=iobuf_get2(a)) != -1 && c != '\n'; )
......@@ -382,8 +382,8 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
state = fhdrCHECKDashEscaped3;
}
else {
/* fixme: we should check wether this line continues
* it is poosible that we have only read ws until here
/* fixme: we should check whether this line continues
* it is possible that we have only read ws until here
* and more stuff is to come */
state = fhdrEOF;
}
......@@ -425,7 +425,7 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
case fhdrEMPTYClearsig:
case fhdrREADClearsig:
/* we are at the start of a line: read a clearsig into the buffer
* we have to look for a the header line or dashed escaped text*/
* we have to look for a header line or dashed escaped text*/
n = 0;
c = 0;
while( n < buflen && (c=iobuf_get2(a)) != -1 && c != '\n' )
......@@ -508,11 +508,11 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
break;
case fhdrTESTSpaces: {
/* but must check wether the rest of the line
* does only contain white spaces; this is problematic
* since we may have to restore the stuffs. simply
/* but must check whether the rest of the line
* only contains white spaces; this is problematic
* since we may have to restore the stuff. simply
* counting spaces is not enough, because it may be a
* mix of different white space chacters */
* mix of different white space characters */
IOBUF b = iobuf_temp();
while( (c=iobuf_get2(a)) != -1 && c != '\n' ) {
iobuf_put(b,c);
......@@ -589,7 +589,7 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
}
/* figure out wether the data is armored or not */
/* figure out whether the data is armored or not */
static int
check_input( armor_filter_context_t *afx, IOBUF a )
{
......@@ -844,7 +844,7 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn,
/****************
* The filter is used to handle the armor stuff
* This filter is used to handle the armor stuff
*/
int
armor_filter( void *opaque, int control,
......@@ -906,7 +906,7 @@ armor_filter( void *opaque, int control,
* is easy to construct the packets */
/* first a onepass signature packet */
buf[0] = 0x90; /* old packet forma, type 4, 1 length byte */
buf[0] = 0x90; /* old packet format, type 4, 1 length byte */
buf[1] = 13; /* length */
buf[2] = 3; /* version */
buf[3] = 0x01; /* sigclass 0x01 (data in canonical text mode)*/
......
......@@ -542,7 +542,7 @@ write_header( IOBUF out, int ctb, u32 len )
/****************
* if HDRLEN is > 0, try to build a header of this length.
* we need this, so hat we can hash packets without reading them again.
* we need this, so that we can hash packets without reading them again.
*/
static int
write_header2( IOBUF out, int ctb, u32 len, int hdrlen, int blkmode )
......
......@@ -37,7 +37,7 @@
/****************
* This filter is used to en/de-cipher data with a conventinal algorithm
* This filter is used to en/de-cipher data with a conventional algorithm
*/
int
cipher_filter( void *opaque, int control,
......
......@@ -102,7 +102,7 @@ init_uncompress( compress_filter_context_t *zfx, z_stream *zs )
/****************
* PGP uses a windowsize of 13 bits. Using a negative value for
* it forces zlib not to expect a zlib header. This is a
* undocumented feature, Peter Gutmann told me about.
* undocumented feature Peter Gutmann told me about.
*/
if( (rc = zfx->pgpmode? inflateInit2( zs, -13)
: inflateInit( zs )) != Z_OK ) {
......
......@@ -39,9 +39,9 @@
/****************
* Assume that the input is an encrypted message and decrypt
* (and if signed, verify the signature) it.
* (and if signed, verify the signature on) it.
* This command differs from the default operation, as it never
* write to the filename which is included in the file and that it
* writes to the filename which is included in the file and it
* rejects files which don't begin with an encrypted message.
*/
......
......@@ -42,7 +42,7 @@ static int write_pubkey_enc_from_list( PKC_LIST pkc_list, DEK *dek, IOBUF out );
/****************
* Encode FILENAME only with the symmetric cipher. Take input from
* Encode FILENAME with only the symmetric cipher. Take input from
* stdin if FILENAME is NULL.
*/
int
......@@ -52,7 +52,7 @@ encode_symmetric( const char *filename )
}
/****************
* Encode FILENAME as literal data packet only. Take input from
* Encode FILENAME as a literal data packet only. Take input from
* stdin if FILENAME is NULL.
*/
int
......
......@@ -35,9 +35,9 @@