diff --git a/CHANGES b/CHANGES index be2330d654..e0ac7997be 100644 --- a/CHANGES +++ b/CHANGES @@ -71,7 +71,7 @@ The "unified" build system is aimed to be a common system for all platforms we support. With it comes new support for VMS. - This system builds supports building in a differnt directory tree + This system builds supports building in a different directory tree than the source tree. It produces one Makefile (for unix family or lookalikes), or one descrip.mms (for VMS). diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 6e5e71a785..2ad53e7d1b 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -284,7 +284,7 @@ # more sense? # - Keep in mind that the HP compiler by default generates code # suitable for execution on the host you're currently compiling at. -# If the toolkit is ment to be used on various PA-RISC processors +# If the toolkit is meant to be used on various PA-RISC processors # consider './Configure hpux-parisc-[g]cc +DAportable'. # - -DMD32_XARRAY triggers workaround for compiler bug we ran into in # 32-bit message digests. (For the moment of this writing) HP C @@ -292,7 +292,7 @@ # chew forever:-). For more details look-up MD32_XARRAY comment in # crypto/sha/sha_lcl.h. # - originally there were 32-bit hpux-parisc2-* targets. They were -# scrapped, because a) they were not interchangable with other 32-bit +# scrapped, because a) they were not interchangeable with other 32-bit # targets; a) when critical 32-bit assembly modules detect if they # are executed on PA-RISC 2.0 and thus adequate performance is # provided. diff --git a/Configurations/README b/Configurations/README index c031884896..1885157123 100644 --- a/Configurations/README +++ b/Configurations/README @@ -216,7 +216,7 @@ In each table entry, the following keys are significant: 'inherit_from' that indicate what other configurations to inherit data from. These are resolved recursively. - Inheritance works as a set of default values that can be overriden + Inheritance works as a set of default values that can be overridden by corresponding key values in the inheriting configuration. Note 1: any configuration table can be used as a template. @@ -530,7 +530,7 @@ They are all expected to return a string with the lines they produce. 'lib' has the intended library file name *without* extension, libobj2shlib is expected to add that. - 'shlib' has the correcponding shared library name + 'shlib' has the corresponding shared library name *without* extension. 'deps' has the list of other libraries (also *without* extension) this library needs to be linked with. 'objs' has the list of @@ -596,7 +596,7 @@ the build file actions run with the build tree top as current working directory. Make sure to end the section with these functions with a string that -you thing is apropriate for the resulting build file. If nothing +you thing is appropriate for the resulting build file. If nothing else, end it like this: ""; # Make sure no lingering values end up in the Makefile diff --git a/Configurations/README.design b/Configurations/README.design index 362b967f17..8b94e220e3 100644 --- a/Configurations/README.design +++ b/Configurations/README.design @@ -28,11 +28,11 @@ information needed to build output files, and therefore only (with a few possible exceptions [1]) have information about end products (such as scripts, library files and programs) and source files (such as C files, C header files, assembler files, etc). Intermediate files such -as object files are rarely directly refered to in build.info files (and +as object files are rarely directly referred to in build.info files (and when they are, it's always with the file name extension .o), they are -infered by Configure. By the same rule of minimalism, end product +inferred by Configure. By the same rule of minimalism, end product file name extensions (such as .so, .a, .exe, etc) are never mentioned -in build.info. Their file name extensions will be infered by the +in build.info. Their file name extensions will be inferred by the build-file templates, adapted for the platform they are meant for (see sections on %unified_info and build-file templates further down). @@ -112,7 +112,7 @@ Unix-like operating systems. Two things are worth an extra note: -'DEPEND[cversion.o]' mentiones an object file. DEPEND indexes is the +'DEPEND[cversion.o]' mentions an object file. DEPEND indexes is the only location where it's valid to mention them Lines in 'BEGINRAW'..'ENDRAW' sections must always mention files as @@ -361,7 +361,7 @@ section above would be digested into a %unified_info table: }, ); -As can be seen, everything in %unified_info is fairly simple nuggest +As can be seen, everything in %unified_info is fairly simple suggest of information. Still, it tells us that to build all programs, we must build 'apps/openssl', and to build the latter, we will need to build all its sources ('apps/openssl.o' in this case) and all the @@ -434,7 +434,7 @@ etc. 'lib' has the intended library file name *without* extension, libobj2shlib is expected to add that. - 'shlib' has the correcponding shared library name + 'shlib' has the corresponding shared library name *without* extension. 'deps' has the list of other libraries (also *without* extension) this library needs to be linked with. 'objs' has the list of diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c index 99c0b7ab2f..9a6eaf612a 100644 --- a/crypto/asn1/bio_ndef.c +++ b/crypto/asn1/bio_ndef.c @@ -64,7 +64,7 @@ /* * The usage is quite simple, initialize an ASN1 structure, get a BIO from it * then any data written through the BIO will end up translated to - * approptiate format on the fly. The data is streamed out and does *not* + * appropriate format on the fly. The data is streamed out and does *not* * need to be all held in memory at once. When the BIO is flushed the output * is finalized and any signatures etc written out. The BIO is a 'proper' * BIO and can handle non blocking I/O correctly. The usage is simple. The diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod index 6bf731a871..fea4dc013f 100644 --- a/doc/ssl/ssl.pod +++ b/doc/ssl/ssl.pod @@ -338,11 +338,11 @@ directory path and one default file path. Both are set via this call. =item int B(SSL_CTX *ctx) -Use the default directory path to locate trusted CA certficates. +Use the default directory path to locate trusted CA certificates. =item int B(SSL_CTX *ctx) -Use the file path to locate trusted CA certficates. +Use the file path to locate trusted CA certificates. =item int B(SSL_CTX *s, int idx, char *arg); diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 05ea50df56..9a06bdd1dc 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -48,7 +48,7 @@ extern "C" { * * libcrypto.so.0.9 * - * Some unixen also make a softlink with the major verson number only: + * Some unixen also make a softlink with the major version number only: * * libcrypto.so.0 * diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t index f0a8faecd6..dd7f4acbf1 100644 --- a/test/recipes/40-test_rehash.t +++ b/test/recipes/40-test_rehash.t @@ -39,7 +39,7 @@ indir "rehash.$$" => sub { chmod 0500, curdir(); SKIP: { if (!ok(!open(FOO, ">unwritable.txt"), - "Testing that we aren't running as a priviledged user, such as root")) { + "Testing that we aren't running as a privileged user, such as root")) { close FOO; skip "It's pointless to run the next test as root", 1; } diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 763b0af61d..55e3d75571 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -141,7 +141,7 @@ $proxy->clientflags("-sess_in ".$session); $proxy->clientstart(); checkmessages(5, "Session resumption extended master secret test", 1, 1, 0); -#Test 6: Session resumption extended master secret test orginial session +#Test 6: Session resumption extended master secret test original session # omits extension. Server must not resume session. #Expected result: ClientHello extension seen; ServerHello extension seen # Full handshake @@ -172,7 +172,7 @@ $proxy->clear(); $proxy->clientflags("-sess_in ".$session); setrmextms(1, 0); $proxy->clientstart(); -ok(TLSProxy::Message->fail(), "Client inconsistent session resupmption"); +ok(TLSProxy::Message->fail(), "Client inconsistent session resumption"); #Test 8: Session resumption extended master secret test resumed session # omits server extension. Client must abort connection.