Fix typos (PR# 1099)

TestScripts/cryptest.sh

@@ -5755,10 +5755,10 @@ if [[ "$IS_SOLARIS" -ne 0 ]]; then
         # Release build
         echo
         echo "************************************" | tee -a "$TEST_RESULTS"
-        echo "Testing: Soalris GCC, release, default CXXFLAGS" | tee -a "$TEST_RESULTS"
+        echo "Testing: Solaris GCC, release, default CXXFLAGS" | tee -a "$TEST_RESULTS"
         echo
 
-        TEST_LIST+=("Soalris GCC, release, default CXXFLAGS")
+        TEST_LIST+=("Solaris GCC, release, default CXXFLAGS")
 
         "$MAKE" clean &>/dev/null
         rm -f "${TMPDIR}/test.exe" &>/dev/null

TestVectors/Readme.txt

@@ -58,7 +58,7 @@ PublicElement - the public element when KeyFormat=Component
 PrivateExponent - the private exponent when KeyFormat=Component
 Message - encoded string, message to be signed or verified
 Signature - encoded string, signature to be verified or compared with
-BlockSize - encoded string, block size for vaiable block ciphers
+BlockSize - encoded string, block size for variable block ciphers
 Plaintext - encoded string
 Ciphertext - encoded string
 Header - encoded string

asn.h

@@ -110,7 +110,7 @@ class CRYPTOPP_DLL UnknownOID : public BERDecodeErr
 	/// \brief Construct an UnknownOID
 	UnknownOID() : BERDecodeErr("BER decode error: unknown object identifier") {}
 	/// \brief Construct an UnknownOID
-	/// \param err error message to use for the execption
+	/// \param err error message to use for the exception
 	UnknownOID(const char *err) : BERDecodeErr(err) {}
 };
 

basecode.cpp

@@ -182,7 +182,7 @@ void BaseN_Decoder::InitializeDecodingLookupArray(int *lookup, const byte *alpha
 	for (unsigned int i=0; i<base; i++)
 	{
 		// Debug asserts for 'lookup[alphabet[i]] == -1' removed because the self tests
-		// have unusal tests that try to break the encoders and decoders. Tests include
+		// have unusual tests that try to break the encoders and decoders. Tests include
 		// a string of the same characters. I.,e., a string of stars like '********...'.
 		if (caseInsensitive && isalpha(alphabet[i]))
 		{

chacha.h

@@ -3,7 +3,7 @@
 //            and Bernstein's reference ChaCha family implementation at
 //            http://cr.yp.to/chacha.html.
 
-// The library added Bernstein's ChaCha classses at Crypto++ 5.6.4. The IETF
+// The library added Bernstein's ChaCha classes at Crypto++ 5.6.4. The IETF
 // uses a slightly different implementation than Bernstein, and the IETF
 // ChaCha and XChaCha classes were added at Crypto++ 8.1. We wanted to maintain
 // ABI compatibility at the 8.1 release so the original ChaCha classes were not

config_asm.h

@@ -130,7 +130,7 @@
 #endif
 
 // Couple to CRYPTOPP_DISABLE_AESNI, but use CRYPTOPP_CLMUL_AVAILABLE so we can selectively
-//  disable for misbehaving platofrms and compilers, like Solaris or some Clang.
+//  disable for misbehaving platforms and compilers, like Solaris or some Clang.
 #if defined(CRYPTOPP_DISABLE_AESNI)
 	#define CRYPTOPP_DISABLE_CLMUL 1
 #endif

config_dll.h

@@ -104,7 +104,7 @@
 	/// \brief Override for internal linkage
 	/// \details CRYPTOPP_TABLE can be used to override internal linkage
 	///  on tables with the <tt>const</tt> qualifier. According to C++ rules
-	///  a decalration with <tt>const</tt> qualifier is internal linkage.
+	///  a declaration with <tt>const</tt> qualifier is internal linkage.
 	/// \note The name CRYPTOPP_TABLE was chosen because it is often used to
 	///  export a table, like AES or SHA constants. The name avoids collisions
 	///  with the DLL gear macros, like CRYPTOPP_EXPORTS and CRYPTOPP_EXTERN.

cryptdll.vcxproj

@@ -22,7 +22,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
-  <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
+  <!-- precedes the import of Cpp.Default.props and Cpp.props -->
   <!-- https://msdn.microsoft.com/en-us/library/2208a1f2.aspx -->
   <PropertyGroup Label="Globals">
     <ProjectGuid>{94a428a1-9ba8-4db2-b76e-bd2e3c08f257}</ProjectGuid>

cryptest.vcxproj

@@ -38,7 +38,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
-  <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
+  <!-- precedes the import of Cpp.Default.props and Cpp.props -->
   <!-- https://msdn.microsoft.com/en-us/library/2208a1f2.aspx -->
   <PropertyGroup Label="Globals">
     <ProjectGuid>{09cdac08-e6ae-48a9-8de7-0fbc779eebde}</ProjectGuid>

cryptlib.h

@@ -2100,7 +2100,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BufferedTransformation : public Algorithm,
 		void CopyAllTo(BufferedTransformation &target, const std::string &channel=DEFAULT_CHANNEL) const;
 
 		/// \brief Retrieve the next message in a series
-		/// \return true if a message was retreved, false otherwise
+		/// \return true if a message was retrieved, false otherwise
 		/// \details Internally, the base class implementation returns false.
 		virtual bool GetNextMessageSeries() {return false;}
 		/// \brief Provides the number of messages in a series
@@ -2432,7 +2432,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoMaterial : public NameValuePairs
 	/// \throw NotImplemented
 	/// \details Save() writes the material to a BufferedTransformation.
 	/// \details If the material is a key, then the key is written with ASN.1 DER encoding. The key
-	///  includes an object identifier with an algorthm id, like a subjectPublicKeyInfo.
+	///  includes an object identifier with an algorithm id, like a subjectPublicKeyInfo.
 	/// \details A "raw" key without the "key info" can be saved using a key's DEREncode() method.
 	/// \details If a derived class does not override Save(), then the base class throws
 	///  NotImplemented().
@@ -2449,7 +2449,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoMaterial : public NameValuePairs
 	///   <li>the key should be ASN.1 BER encoded
 	///   <li>the key should be a "key info"
 	///   </ul>
-	/// \details "key info" means the key should have an object identifier with an algorthm id,
+	/// \details "key info" means the key should have an object identifier with an algorithm id,
 	///  like a subjectPublicKeyInfo.
 	/// \details To read a "raw" key without the "key info", then call the key's BERDecode() method.
 	/// \note Load() generally does not check that the key is valid. Call Validate(), if needed.
@@ -2541,7 +2541,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PrivateKey : public GeneratableCryptoMater
 {
 };
 
-/// \brief Interface for crypto prameters
+/// \brief Interface for crypto parameters
 class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CryptoParameters : public GeneratableCryptoMaterial
 {
 };
@@ -2881,7 +2881,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Signer : public PK_SignatureScheme, pub
 	/// \brief Create a new HashTransformation to accumulate the message to be signed
 	/// \param rng a RandomNumberGenerator derived class
 	/// \return a pointer to a PK_MessageAccumulator
-	/// \details NewSignatureAccumulator() can be used with all signing methods. Sign() will autimatically delete the
+	/// \details NewSignatureAccumulator() can be used with all signing methods. Sign() will automatically delete the
 	///  accumulator pointer. The caller is responsible for deletion if a method is called that takes a reference.
 	virtual PK_MessageAccumulator * NewSignatureAccumulator(RandomNumberGenerator &rng) const =0;
 
@@ -2944,7 +2944,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE PK_Verifier : public PK_SignatureScheme, p
 
 	/// \brief Create a new HashTransformation to accumulate the message to be verified
 	/// \return a pointer to a PK_MessageAccumulator
-	/// \details NewVerificationAccumulator() can be used with all verification methods. Verify() will autimatically delete
+	/// \details NewVerificationAccumulator() can be used with all verification methods. Verify() will automatically delete
 	///  the accumulator pointer. The caller is responsible for deletion if a method is called that takes a reference.
 	virtual PK_MessageAccumulator * NewVerificationAccumulator() const =0;
 

cryptlib.vcxproj

@@ -38,7 +38,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
-  <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
+  <!-- precedes the import of Cpp.Default.props and Cpp.props -->
   <!-- https://msdn.microsoft.com/en-us/library/2208a1f2.aspx -->
   <PropertyGroup Label="Globals">
     <ProjectGuid>{c39f4b46-6e89-4074-902e-ca57073044d2}</ProjectGuid>

default.cpp

@@ -19,7 +19,7 @@
 NAMESPACE_BEGIN(CryptoPP)
 
 // The purpose of this function Mash() is to take an arbitrary length input
-// string and *deterministicly* produce an arbitrary length output string such
+// string and *deterministically* produce an arbitrary length output string such
 // that (1) it looks random, (2) no information about the input is
 // deducible from it, and (3) it contains as much entropy as it can hold, or
 // the amount of entropy in the input string, whichever is smaller.
@@ -28,7 +28,7 @@ template <class H>
 static void Mash(const byte *in, size_t inLen, byte *out, size_t outLen, int iterations)
 {
 	if (BytePrecision(outLen) > 2)
-		throw InvalidArgument("Mash: output legnth too large");
+		throw InvalidArgument("Mash: output length too large");
 
 	size_t bufSize = RoundUpToMultipleOf(outLen, (size_t)H::DIGESTSIZE);
 	byte b[2];

dlltest.vcxproj

@@ -22,7 +22,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Microsoft documentation clearly shows the Global property group -->
-  <!-- preceeds the import of Cpp.Default.props and Cpp.props -->
+  <!-- precedes the import of Cpp.Default.props and Cpp.props -->
   <!-- https://msdn.microsoft.com/en-us/library/2208a1f2.aspx -->
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1974a53a-9863-41c9-886d-b2b8c2fc3c8b}</ProjectGuid>

donna_32.cpp

@@ -1935,7 +1935,7 @@ ed25519_sign_CXX(std::istream& stream, const byte sk[32], const byte pk[32], byt
     ALIGN(ALIGN_SPEC) ge25519 R;
     hash_512bits extsk, hashr, hram;
 
-    // Unfortunately we need to read the stream twice. The fisrt time calculates
+    // Unfortunately we need to read the stream twice. The first time calculates
     // 'r = H(aExt[32..64], m)'. The second time calculates 'S = H(R,A,m)'. There
     // is a data dependency due to hashing 'RS' with 'R = [r]B' that does not
     // allow us to read the stream once.

donna_64.cpp

@@ -1650,7 +1650,7 @@ ed25519_sign_CXX(std::istream& stream, const byte sk[32], const byte pk[32], byt
     ALIGN(ALIGN_SPEC) ge25519 R;
     hash_512bits extsk, hashr, hram;
 
-    // Unfortunately we need to read the stream twice. The fisrt time calculates
+    // Unfortunately we need to read the stream twice. The first time calculates
     // 'r = H(aExt[32..64], m)'. The second time calculates 'S = H(R,A,m)'. There
     // is a data dependency due to hashing 'RS' with 'R = [r]B' that does not
     // allow us to read the stream once.

donna_sse.cpp

@@ -6,7 +6,7 @@
 // clean, but it has one potential problem. The original code is C and relies
 // upon unions. Accessing the inactive union member is undefined behavior in
 // C++. That means copying the array into packedelem8.u is OK; but then using
-// packedelem8.v in a calcualtion is UB. Fortunately most (all?) compilers
+// packedelem8.v in a calculation is UB. Fortunately most (all?) compilers
 // take pity on C++ developers and compile the code. We will have to keep an
 // eye on things or rewrite significant portions of this code.
 

eccrypto.h

@@ -587,15 +587,15 @@ struct ECGDSA : public DL_SS<
 
 /// \brief Elliptic Curve Integrated Encryption Scheme
 /// \tparam COFACTOR_OPTION cofactor multiplication option
-/// \tparam HASH HashTransformation derived class used for key drivation and MAC computation
+/// \tparam HASH HashTransformation derived class used for key derivation and MAC computation
 /// \tparam DHAES_MODE flag indicating if the MAC includes additional context parameters such as <em>u·V</em>, <em>v·U</em> and label
 /// \tparam LABEL_OCTETS flag indicating if the label size is specified in octets or bits
 /// \details ECIES is an Elliptic Curve based Integrated Encryption Scheme (IES). The scheme combines a Key Encapsulation
 ///  Method (KEM) with a Data Encapsulation Method (DEM) and a MAC tag. The scheme is
 ///  <A HREF="http://en.wikipedia.org/wiki/ciphertext_indistinguishability">IND-CCA2</A>, which is a strong notion of security.
 ///  You should prefer an Integrated Encryption Scheme over homegrown schemes.
 /// \details If you desire an Integrated Encryption Scheme with Crypto++ 4.2 compatibility, then use the ECIES_P1363.
-///  If you desire an Integrated Encryption Scheme compatibile with Bouncy Castle 1.54 and Botan 1.11 compatibility, then use the ECIES
+///  If you desire an Integrated Encryption Scheme compatible with Bouncy Castle 1.54 and Botan 1.11 compatibility, then use the ECIES
 ///  template class with <tt>NoCofactorMultiplication</tt>, <tt>DHAES_MODE=true</tt> and <tt>LABEL_OCTETS=false</tt>.
 /// \details The default template parameters ensure compatibility with Bouncy Castle 1.54 and Botan 1.11. The combination of
 ///  <tt>IncompatibleCofactorMultiplication</tt> and <tt>DHAES_MODE=true</tt> is recommended for best efficiency and security.
@@ -619,16 +619,16 @@ struct ECIES
 
 /// \brief Elliptic Curve Integrated Encryption Scheme for P1363
 /// \tparam COFACTOR_OPTION cofactor multiplication option
-/// \tparam HASH HashTransformation derived class used for key drivation and MAC computation
+/// \tparam HASH HashTransformation derived class used for key derivation and MAC computation
 /// \details ECIES_P1363 is an Elliptic Curve based Integrated Encryption Scheme (IES) for P1363. The scheme combines a Key Encapsulation
 ///  Method (KEM) with a Data Encapsulation Method (DEM) and a MAC tag. The scheme is
 ///  <A HREF="http://en.wikipedia.org/wiki/ciphertext_indistinguishability">IND-CCA2</A>, which is a strong notion of security.
 ///  You should prefer an Integrated Encryption Scheme over homegrown schemes.
 /// \details The library's original implementation is based on an early P1363 draft, which itself appears to be based on an early Certicom
-///  SEC-1 draft (or an early SEC-1 draft was based on a P1363 draft). Crypto++ 4.2 used the early draft in its Integrated Ecryption
+///  SEC-1 draft (or an early SEC-1 draft was based on a P1363 draft). Crypto++ 4.2 used the early draft in its Integrated Enryption
 ///  Schemes with <tt>NoCofactorMultiplication</tt>, <tt>DHAES_MODE=false</tt> and <tt>LABEL_OCTETS=true</tt>.
 /// \details If you desire an Integrated Encryption Scheme with Crypto++ 4.2 compatibility, then use the ECIES_P1363.
-///  If you desire an Integrated Encryption Scheme compatibile with Bouncy Castle 1.54 and Botan 1.11 compatibility, then use the ECIES
+///  If you desire an Integrated Encryption Scheme compatible with Bouncy Castle 1.54 and Botan 1.11 compatibility, then use the ECIES
 ///  template class with <tt>NoCofactorMultiplication</tt>, <tt>DHAES_MODE=true</tt> and <tt>LABEL_OCTETS=false</tt>.
 /// \details The default template parameters ensure compatibility with P1363. The combination of
 ///  <tt>IncompatibleCofactorMultiplication</tt> and <tt>DHAES_MODE=true</tt> is recommended for best efficiency and security.

filters.h

@@ -25,7 +25,7 @@
 NAMESPACE_BEGIN(CryptoPP)
 
 /// \brief Implementation of BufferedTransformation's attachment interface
-/// \details Filter is a cornerstone of the Pipeline trinitiy. Data flows from
+/// \details Filter is a cornerstone of the Pipeline trinity. Data flows from
 ///  Sources, through Filters, and then terminates in Sinks. The difference
 ///  between a Source and Filter is a Source \a pumps data, while a Filter does
 ///  not. The difference between a Filter and a Sink is a Filter allows an
@@ -222,7 +222,7 @@ struct CRYPTOPP_DLL FilterPutSpaceHelper
 	byte *HelpCreatePutSpace(BufferedTransformation &target, const std::string &channel, size_t minSize, size_t bufferSize)
 		{return HelpCreatePutSpace(target, channel, minSize, minSize, bufferSize);}
 
-	/// \brief Temporay working space
+	/// \brief Temporary working space
 	SecByteBlock m_tempSpace;
 };
 
@@ -537,7 +537,7 @@ class CRYPTOPP_DLL StreamTransformationFilter : public FilterWithBufferedInput,
 	/// \param c reference to a StreamTransformation
 	/// \param attachment an optional attached transformation
 	/// \param padding the \ref BlockPaddingSchemeDef "padding scheme"
-	/// \details This contructor creates a StreamTransformationFilter() for stream ciphers and
+	/// \details This constructor creates a StreamTransformationFilter() for stream ciphers and
 	///  confidentiality-only block cipher modes of operation. If you are using an authenticated
 	///  encryption mode of operation, then use either AuthenticatedEncryptionFilter() or
 	///  AuthenticatedDecryptionFilter().
@@ -1191,7 +1191,7 @@ class RandomNumberSink : public Bufferless<Sink>
 
 /// \brief Copy input to a memory buffer
 /// \details ArraySink wraps a fixed size buffer. The buffer is full once Put returns non-0.
-///  When used in a pipleline, ArraySink silently discards input if the buffer is full.
+///  When used in a pipeline, ArraySink silently discards input if the buffer is full.
 ///  AvailableSize() can be used to determine how much space remains in the buffer.
 ///  TotalPutLength() can be used to determine how many bytes were processed.
 /// \sa StringSink, ArrayXorSink
@@ -1233,7 +1233,7 @@ class CRYPTOPP_DLL ArraySink : public Bufferless<Sink>
 
 /// \brief Xor input to a memory buffer
 /// \details ArrayXorSink wraps a fixed size buffer. The buffer is full once Put returns non-0.
-///  When used in a pipleline, ArrayXorSink silently discards input if the buffer is full.
+///  When used in a pipeline, ArrayXorSink silently discards input if the buffer is full.
 ///  AvailableSize() can be used to determine how much space remains in the buffer.
 ///  TotalPutLength() can be used to determine how many bytes were processed.
 /// \sa StringSink, ArraySink