[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Sun Mar 20 00:23:37 UTC 2016
The branch master has been updated
via 270862b470d43a283996e681b74fbbb27c7f12e4 (commit)
via 35ed393e5e47d75f9496ed1464bca7fc82cd72d7 (commit)
from 34c2db9b562baffd30a6a2dda7d4247fadbf4acd (commit)
- Log -----------------------------------------------------------------
commit 270862b470d43a283996e681b74fbbb27c7f12e4
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date: Sat Mar 19 12:43:48 2016 -0400
Fixed language
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 35ed393e5e47d75f9496ed1464bca7fc82cd72d7
Author: Alex Gaynor <alex.gaynor at gmail.com>
Date: Sat Mar 19 12:28:58 2016 -0400
Fixed a bunch of typos in the docs
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
doc/HOWTO/proxy_certificates.txt | 2 +-
doc/apps/ca.pod | 2 +-
doc/apps/cms.pod | 2 +-
doc/apps/config.pod | 4 ++--
doc/apps/dgst.pod | 6 +++---
doc/apps/dhparam.pod | 2 +-
doc/apps/dsaparam.pod | 2 +-
doc/apps/ec.pod | 4 ++--
doc/apps/ecparam.pod | 6 +++---
doc/apps/gendsa.pod | 2 +-
doc/apps/genrsa.pod | 2 +-
doc/apps/pkcs12.pod | 2 +-
doc/apps/rand.pod | 2 +-
doc/apps/req.pod | 2 +-
doc/apps/s_client.pod | 2 +-
doc/apps/s_server.pod | 2 +-
doc/apps/smime.pod | 2 +-
doc/apps/verify.pod | 2 +-
doc/apps/x509.pod | 2 +-
doc/crypto/ASN1_INTEGER_get_int64.pod | 2 +-
doc/crypto/ASN1_OBJECT_new.pod | 2 +-
doc/crypto/ASYNC_start_job.pod | 2 +-
doc/crypto/BIO_ADDRINFO.pod | 2 +-
23 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/doc/HOWTO/proxy_certificates.txt b/doc/HOWTO/proxy_certificates.txt
index d78be2f1..a22784d 100644
--- a/doc/HOWTO/proxy_certificates.txt
+++ b/doc/HOWTO/proxy_certificates.txt
@@ -258,7 +258,7 @@ Here is some skeleton code you can fill in:
}
else if (!(xs->ex_flags & EXFLAG_CA))
{
- /* We have a EE certificate, let's use it to set default!
+ /* We have an EE certificate, let's use it to set default!
*/
YOUR_RIGHTS *rights =
(YOUR_RIGHTS *)X509_STORE_CTX_get_ex_data(ctx,
diff --git a/doc/apps/ca.pod b/doc/apps/ca.pod
index c2acd72..cd7cad7 100644
--- a/doc/apps/ca.pod
+++ b/doc/apps/ca.pod
@@ -101,7 +101,7 @@ section for information on the required input and output format.
=item B<-infiles>
if present this should be the last option, all subsequent arguments
-are assumed to the the names of files containing certificate requests.
+are taken as the names of files containing certificate requests.
=item B<-out filename>
diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
index 7a3505c..36e6b3c 100644
--- a/doc/apps/cms.pod
+++ b/doc/apps/cms.pod
@@ -454,7 +454,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/config.pod b/doc/apps/config.pod
index 474b478..665a1bb 100644
--- a/doc/apps/config.pod
+++ b/doc/apps/config.pod
@@ -292,7 +292,7 @@ This next example shows how to expand environment variables safely.
Suppose you want a variable called B<tmpfile> to refer to a
temporary filename. The directory it is placed in can determined by
-the the B<TEMP> or B<TMP> environment variables but they may not be
+the B<TEMP> or B<TMP> environment variables but they may not be
set to any value at all. If you just include the environment variable
names and the variable doesn't exist then this will cause an error when
an attempt is made to load the configuration file. By making use of the
@@ -344,7 +344,7 @@ More complex OpenSSL library configuration. Add OID and don't enter FIPS mode:
# New OID shortname and long name
newoid2 = New OID 2 long name, 1.2.3.4.2
-The above examples can be used with with any application supporting library
+The above examples can be used with any application supporting library
configuration if "openssl_conf" is modified to match the appropriate "appname".
For example if the second sample file above is saved to "example.cnf" then
diff --git a/doc/apps/dgst.pod b/doc/apps/dgst.pod
index 7b3001e..fc256b2 100644
--- a/doc/apps/dgst.pod
+++ b/doc/apps/dgst.pod
@@ -106,12 +106,12 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
=item B<-verify filename>
-verify the signature using the the public key in "filename".
+verify the signature using the public key in "filename".
The output is either "Verification OK" or "Verification Failure".
=item B<-prverify filename>
-verify the signature using the the private key in "filename".
+verify the signature using the private key in "filename".
=item B<-signature filename>
@@ -154,7 +154,7 @@ for example exactly 32 chars for gost-mac.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/dhparam.pod b/doc/apps/dhparam.pod
index 5cf4d4f..3557dee 100644
--- a/doc/apps/dhparam.pod
+++ b/doc/apps/dhparam.pod
@@ -85,7 +85,7 @@ default generator 2.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/dsaparam.pod b/doc/apps/dsaparam.pod
index 1db7141..f8eff94 100644
--- a/doc/apps/dsaparam.pod
+++ b/doc/apps/dsaparam.pod
@@ -78,7 +78,7 @@ parameters.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/ec.pod b/doc/apps/ec.pod
index 9cf579d..befb93c 100644
--- a/doc/apps/ec.pod
+++ b/doc/apps/ec.pod
@@ -33,7 +33,7 @@ B<openssl> B<ec>
The B<ec> command processes EC keys. They can be converted between various
forms and their components printed out. B<Note> OpenSSL uses the
private key format specified in 'SEC 1: Elliptic Curve Cryptography'
-(http://www.secg.org/). To convert a OpenSSL EC private key into the
+(http://www.secg.org/). To convert an OpenSSL EC private key into the
PKCS#8 private key format use the B<pkcs8> command.
=head1 COMMAND OPTIONS
@@ -129,7 +129,7 @@ the preprocessor macro B<OPENSSL_EC_BIN_PT_COMP> at compile time.
This specifies how the elliptic curve parameters are encoded.
Possible value are: B<named_curve>, i.e. the ec parameters are
-specified by a OID, or B<explicit> where the ec parameters are
+specified by an OID, or B<explicit> where the ec parameters are
explicitly given (see RFC 3279 for the definition of the
EC parameters structures). The default value is B<named_curve>.
B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279,
diff --git a/doc/apps/ecparam.pod b/doc/apps/ecparam.pod
index 767bb9c..c5500b2 100644
--- a/doc/apps/ecparam.pod
+++ b/doc/apps/ecparam.pod
@@ -101,7 +101,7 @@ the preprocessor macro B<OPENSSL_EC_BIN_PT_COMP> at compile time.
This specifies how the elliptic curve parameters are encoded.
Possible value are: B<named_curve>, i.e. the ec parameters are
-specified by a OID, or B<explicit> where the ec parameters are
+specified by an OID, or B<explicit> where the ec parameters are
explicitly given (see RFC 3279 for the definition of the
EC parameters structures). The default value is B<named_curve>.
B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279,
@@ -114,13 +114,13 @@ is included in the ECParameters structure (see RFC 3279).
=item B<-genkey>
-This option will generate a EC private key using the specified parameters.
+This option will generate an EC private key using the specified parameters.
=item B<-rand file(s)>
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/gendsa.pod b/doc/apps/gendsa.pod
index 3c9687b..f4fef8d 100644
--- a/doc/apps/gendsa.pod
+++ b/doc/apps/gendsa.pod
@@ -50,7 +50,7 @@ If none of these options is specified no encryption is used.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/genrsa.pod b/doc/apps/genrsa.pod
index 0eb8600..37ced0d 100644
--- a/doc/apps/genrsa.pod
+++ b/doc/apps/genrsa.pod
@@ -62,7 +62,7 @@ the public exponent to use, either 65537 or 3. The default is 65537.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/pkcs12.pod b/doc/apps/pkcs12.pod
index d789714..d38484b 100644
--- a/doc/apps/pkcs12.pod
+++ b/doc/apps/pkcs12.pod
@@ -274,7 +274,7 @@ don't attempt to provide the MAC integrity.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/rand.pod b/doc/apps/rand.pod
index b5752a2..444dcbb 100644
--- a/doc/apps/rand.pod
+++ b/doc/apps/rand.pod
@@ -39,7 +39,7 @@ Write to I<file> instead of standard output.
Use specified file or files or EGD socket (see L<RAND_egd(3)>)
for seeding the random number generator.
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/req.pod b/doc/apps/req.pod
index 12a0687..8353e9a 100644
--- a/doc/apps/req.pod
+++ b/doc/apps/req.pod
@@ -134,7 +134,7 @@ key using information specified in the configuration file.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 7e03a24..1873293 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -436,7 +436,7 @@ for all available algorithms.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index d63a206..25e5444 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -435,7 +435,7 @@ IDs (eg. with a certain prefix).
A file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index 82f3ecc..418d8fa 100644
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -286,7 +286,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
a file or files containing random data used to seed the random number
generator, or an EGD socket (see L<RAND_egd(3)>).
-Multiple files can be specified separated by a OS-dependent character.
+Multiple files can be specified separated by an OS-dependent character.
The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
all others.
diff --git a/doc/apps/verify.pod b/doc/apps/verify.pod
index 851bb77..ecde35f 100644
--- a/doc/apps/verify.pod
+++ b/doc/apps/verify.pod
@@ -200,7 +200,7 @@ effect.
=item B<-untrusted file>
A B<file> of additional untrusted certificates (intermediate issuer CAs) used
-to constuct a certificate chain from the subject certificate to a trust-anchor.
+to construct a certificate chain from the subject certificate to a trust-anchor.
The B<file> should contain one or more certificates in PEM format.
This option can be specified more than once to include untrusted certiificates
from multiple B<files>.
diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod
index 7efa4c1..2dc225b 100644
--- a/doc/apps/x509.pod
+++ b/doc/apps/x509.pod
@@ -151,7 +151,7 @@ this option prevents output of the encoded version of the request.
=item B<-pubkey>
-outputs the the certificate's SubjectPublicKeyInfo block in PEM format.
+outputs the certificate's SubjectPublicKeyInfo block in PEM format.
=item B<-modulus>
diff --git a/doc/crypto/ASN1_INTEGER_get_int64.pod b/doc/crypto/ASN1_INTEGER_get_int64.pod
index 3259530..fb10766 100644
--- a/doc/crypto/ASN1_INTEGER_get_int64.pod
+++ b/doc/crypto/ASN1_INTEGER_get_int64.pod
@@ -106,7 +106,7 @@ B<ASN1_ENUMERATED> structure respectively or NULL if an error occurs. They will
only fail due to a memory allocation error.
ASN1_INTEGER_to_BN() and ASN1_ENUMERATED_to_BN() return a B<BIGNUM> structure
-of NULL if an error occurs. They can fail if the pased type is incorrect
+of NULL if an error occurs. They can fail if the passed type is incorrect
(due to programming error) or due to a memory allocation failure.
=head1 SEE ALSO
diff --git a/doc/crypto/ASN1_OBJECT_new.pod b/doc/crypto/ASN1_OBJECT_new.pod
index 486ccc9..cc9cf43 100644
--- a/doc/crypto/ASN1_OBJECT_new.pod
+++ b/doc/crypto/ASN1_OBJECT_new.pod
@@ -16,7 +16,7 @@ ASN1_OBJECT_new, ASN1_OBJECT_free - object allocation functions
The ASN1_OBJECT allocation routines, allocate and free an
ASN1_OBJECT structure, which represents an ASN1 OBJECT IDENTIFIER.
-ASN1_OBJECT_new() allocates and initializes a ASN1_OBJECT structure.
+ASN1_OBJECT_new() allocates and initializes an ASN1_OBJECT structure.
ASN1_OBJECT_free() frees up the B<ASN1_OBJECT> structure B<a>.
If B<a> is NULL, nothing is done.
diff --git a/doc/crypto/ASYNC_start_job.pod b/doc/crypto/ASYNC_start_job.pod
index c64af3d..0e6507b 100644
--- a/doc/crypto/ASYNC_start_job.pod
+++ b/doc/crypto/ASYNC_start_job.pod
@@ -135,7 +135,7 @@ application acquires a lock. It then calls some cryptographic function which
invokes ASYNC_pause_job(). This returns control back to the code that created
the ASYNC_JOB. If that code then attempts to acquire the same lock before
resuming the original job then a deadlock can occur. By calling
-ASYNC_block_pause() immediately after aquiring the lock and
+ASYNC_block_pause() immediately after acquiring the lock and
ASYNC_unblock_pause() immediately before releasing it then this situation cannot
occur.
diff --git a/doc/crypto/BIO_ADDRINFO.pod b/doc/crypto/BIO_ADDRINFO.pod
index 85652ad..42a26e1 100644
--- a/doc/crypto/BIO_ADDRINFO.pod
+++ b/doc/crypto/BIO_ADDRINFO.pod
@@ -71,7 +71,7 @@ with the given one.
=head1 RETURN VALUES
-BIO_lookup() returns 1 on success and 0 when an error occured, and
+BIO_lookup() returns 1 on success and 0 when an error occurred, and
will leave an error indicaton on the OpenSSL error stack in that case.
All other functions described here return 0 or B<NULL> when the
More information about the openssl-commits
mailing list