Fix typos

Thanks to @vlajos https://github.com/vlajos/misspell_fixer

22 files changed, 55 insertions, 55 deletions

diff --git a/configure.py b/configure.py
index d9f1c9e89..b926cd274 100755
--- a/configure.py
+++ b/configure.py
@@ -414,7 +414,7 @@ def process_command_line(args):
     parser.add_option_group(wrapper_group)
     parser.add_option_group(install_group)
 
-    # These exist only for autoconf compatability (requested by zw for mtn)
+    # These exist only for autoconf compatibility (requested by zw for mtn)
     compat_with_autoconf_options = [
         'datadir',
         'datarootdir',
diff --git a/doc/manual/pubkey.rst b/doc/manual/pubkey.rst
index efeea692c..1b3ed305a 100644
--- a/doc/manual/pubkey.rst
+++ b/doc/manual/pubkey.rst
@@ -66,7 +66,7 @@ Nyberg-Rueppel key pairs with
 .. cpp:function:: ElGamal_PrivateKey::ElGamal_PrivateKey(RandomNumberGenerator& rng, \
    const DL_Group& group, const BigInt& x = 0)
 
-  The optional *x* parameter to each of these contructors is a private key
+  The optional *x* parameter to each of these constructors is a private key
   value. This allows you to create keys where the private key is formed by
   some special technique; for instance you can use the hash of a password (see
   :ref:`pbkdf` for how to do that) as a private key value. Normally, you would
@@ -162,7 +162,7 @@ decrypt, if necessary) a PKCS #8 private key:
 These functions will return an object allocated key object based on the data
 from whatever source it is using (assuming, of course, the source is in fact
 storing a representation of a private key, and the decryption was
-sucessful). The encoding used (PEM or BER) need not be specified; the format
+successful). The encoding used (PEM or BER) need not be specified; the format
 will be detected automatically. The key is allocated with ``new``, and should
 be released with ``delete`` when you are done with it. The first takes a
 generic ``DataSource`` that you have to create - the other is a simple wrapper
@@ -286,7 +286,7 @@ where *format* is any of
 * ``ANSI_X9_42`` (or ``DH_PARAMETERS``) for modp groups
 * ``ANSI_X9_57`` (or ``DSA_PARAMETERS``) for DSA-style groups
 * ``PKCS_3`` is an older format for modp groups; it should only
-  be used for backwards compatability.
+  be used for backwards compatibility.
 
 You can reload a serialized group using
 
@@ -366,7 +366,7 @@ these use the EME class:
      method to use is specified in *eme*.
 
      The recommended values for *eme* is "EME1(SHA-1)" or "EME1(SHA-256)". If
-     you need compatability with protocols using the PKCS #1 v1.5 standard,
+     you need compatibility with protocols using the PKCS #1 v1.5 standard,
      you can also use "EME-PKCS1-v1_5".
 
 .. cpp:class:: DLIES_Encryptor
@@ -409,7 +409,7 @@ Signature generation is performed using
      fail. Raw is not useful except in very specialized applications. Examples
      are "EMSA1(SHA-1)" and "EMSA4(SHA-256)".
 
-     For RSA, use EMSA4 (also called PSS) unless you need compatability with
+     For RSA, use EMSA4 (also called PSS) unless you need compatibility with
      software that uses the older PKCS #1 v1.5 standard, in which case use
      EMSA3 (also called "EMSA-PKCS1-v1_5"). For DSA, ECDSA, GOST 34.10-2001,
      and Nyberg-Rueppel, you should use EMSA1.
diff --git a/doc/manual/python.rst b/doc/manual/python.rst
index eb625f24a..a00aabd5e 100644
--- a/doc/manual/python.rst
+++ b/doc/manual/python.rst
@@ -190,7 +190,7 @@ Public Key
 
 .. py:class:: private_key(algo, param, rng)
 
-    Constructor creates a new private key. The paramater type/value
+    Constructor creates a new private key. The parameter type/value
     depends on the algorithm. For "rsa" is is the size of the key in
     bits.  For "ecdsa" and "ecdh" it is a group name (for instance
     "secp256r1"). For "ecdh" there is also a special case for group
diff --git a/doc/manual/secmem.rst b/doc/manual/secmem.rst
index 76751bb40..ce5ff205b 100644
--- a/doc/manual/secmem.rst
+++ b/doc/manual/secmem.rst
@@ -14,7 +14,7 @@ allocator, it has an identical API to the ``std::vector`` you know and
 love.
 
 Some operating systems offer the ability to lock memory into RAM,
-preventing swapping from occuring. Typically this operation is
+preventing swapping from occurring. Typically this operation is
 restricted to privledged users (root or admin), however some OSes
 including Linux and FreeBSD allow normal users to lock a small amount
 of memory. On these systems, allocations first attempt to allocate out
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index 26ac6a801..554846c25 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -497,7 +497,7 @@ TLS Policies
 ``TLS::Policy`` is how an application can control details of what will
 be negotiated during a handshake. The base class acts as the default
 policy. There is also a ``Strict_Policy`` (which forces only secure
-options, reducing compatability) and ``Text_Policy`` which reads
+options, reducing compatibility) and ``Text_Policy`` which reads
 policy settings from a file.
 
 .. cpp:class:: TLS::Policy
diff --git a/doc/manual/x509.rst b/doc/manual/x509.rst
index 211ccbaf9..d4500d692 100644
--- a/doc/manual/x509.rst
+++ b/doc/manual/x509.rst
@@ -276,7 +276,7 @@ The result of the validation is returned as a class:
 
   .. cpp:function:: Certificate_Status_Code result() const
 
-     Returns the 'worst' error that occured during validation.  For
+     Returns the 'worst' error that occurred during validation. For
      instance, we do not want an expired certificate with an invalid
      signature to be reported to the user as being simply expired (a
      relativly innocuous and common error) when the signature isn't
diff --git a/doc/news.rst b/doc/news.rst
index 41277760a..144641913 100644
--- a/doc/news.rst
+++ b/doc/news.rst
@@ -27,7 +27,7 @@ Version 1.11.18, 2015-07-05
   analysis tools. From Simon Warta and Daniel Seither. GH #125
 
 * Several incorrect or missing module dependencies have been fixed. These
-  often prevented a succesful build of a minimized amalgamation when
+  often prevented a successful build of a minimized amalgamation when
   only a small set of algorithms were specified. GH #71
   From Simon Warta.
 
@@ -370,7 +370,7 @@ Version 1.11.10, 2014-12-10
   willing to accept.
 
 * PKCS #8 private keys can now be encrypted using GCM mode instead of
-  unauthenticated CBC. The default remains CBC for compatability.
+  unauthenticated CBC. The default remains CBC for compatibility.
 
 * The default PKCS #8 encryption scheme has changed to use PBKDF2 with
   SHA-256 instead of SHA-1
@@ -491,7 +491,7 @@ Version 1.11.8, 2014-02-13
 * A bug in CFB encryption caused a few bytes past the end of the final
   block to be read. The actual output was not affected.
 
-* Fix compilation errors in the tests that occured with minimized
+* Fix compilation errors in the tests that occurred with minimized
   builds. Contributed by Markus Wanner.
 
 * Add a new ``--destdir`` option to ``configure.py`` which controls
@@ -568,13 +568,13 @@ Version 1.10.6, 2013-11-10
 
 * The device reading entropy source now attempts to read from all
   available devices. Previously it would break out early if a partial
-  read from a blocking source occured, not continuing to read from a
+  read from a blocking source occurred, not continuing to read from a
   non-blocking device. This would cause the library to fall back on
   slower and less reliable techniques for collecting PRNG seed
   material. Reported by Rickard Bellgrim.
 
 * HMAC_RNG (the default PRNG implementation) now automatically reseeds
-  itself periodically. Previously reseeds only occured on explicit
+  itself periodically. Previously reseeds only occurred on explicit
   application request.
 
 * Fix an encoding error in EC_Group when encoding using EC_DOMPAR_ENC_OID.
@@ -746,7 +746,7 @@ Version 1.10.5, 2013-03-02
 
 * Use correct flags for creating a shared library on OS X under Clang.
 
-* Fix a compile time incompatability with Visual C++ 2012.
+* Fix a compile time incompatibility with Visual C++ 2012.
 
 Version 1.11.2, 2013-03-02
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -930,7 +930,7 @@ of OpenSSL use these fields. Now these fields are decoded properly,
 and if the public key value is included it is used, as otherwise the
 public key needs to be rederived from the private key. However the
 library does not include these fields on encoding keys for
-compatability with software that does not expect them (including older
+compatibility with software that does not expect them (including older
 versions of botan).
 
 Version 1.8.14, 2012-07-18
@@ -1020,7 +1020,7 @@ A bug in configure.py would cause it to interpret ``--cpu=s390x`` as
 searches for an exact match, and only if no exact match is found will
 it search for substring matches.
 
-An incompatability in configure.py with the subprocess module included
+An incompatibility in configure.py with the subprocess module included
 in Python 3.1 has been fixed (Bugzilla 157).
 
 The exception catching syntax of configure.py has been changed to the
@@ -1218,7 +1218,7 @@ Version 1.9.16, 2011-04-11
   expanded.
 
 * The class ``EC_Domain_Params`` has been renamed ``EC_Group``, with a
-  typedef for backwards compatability.
+  typedef for backwards compatibility.
 
 * The ``EC_Group`` string constructor didn't understand the standard
   names like "secp160r1", forcing use of the OIDs.
@@ -1242,7 +1242,7 @@ Version 1.9.16, 2011-04-11
   conventions. Instead of ``libbotan-X.Y.Z.so``, the shared lib is
   named ``libbotan-X.Y.so.Z``; this allows the runtime linker to do
   its runtime linky magic. It can be safely presumed that any change
-  in the major or minor version indicates ABI incompatability.
+  in the major or minor version indicates ABI incompatibility.
 
 * Remove the socket wrapper code; it was not actually used by anything
   in the library, only in the examples, and you can use whatever kind
@@ -1340,7 +1340,7 @@ Version 1.9.11, 2010-11-29
   it to a client or server object. Please remember that the TLS
   interface/API is currently unstable and will very likely change
   further before TLS is included in a stable release. A handshake
-  failure that occured when RC4 was negotiated has also been fixed.
+  failure that occurred when RC4 was negotiated has also been fixed.
 
 * Some possible timing channels in the implementations of Montgomery
   reduction and the IDEA key schedule were removed. The table-based
@@ -1381,7 +1381,7 @@ Version 1.8.11, 2010-11-02
 * Fix a number of CRL encoding and decoding bugs
 * When building a debug library under VC++, use the debug runtime
 * Fix compilation under Sun Studio on Linux and Solaris
-* Add several functions for compatability with 1.9
+* Add several functions for compatibility with 1.9
 * In the examples, read most input files as binary
 * The Perl build script has been removed in this release
 
@@ -1391,7 +1391,7 @@ Version 1.8.10, 2010-08-31
 * Switch default PKCS #8 encryption algorithm from 3DES to AES-256
 * Increase default hash iterations from 2048 to 10000 in PBES1 and PBES2
 * Use small tables in the first round of AES
-* Add PBKDF typedef and get_pbkdf for better compatability with 1.9
+* Add PBKDF typedef and get_pbkdf for better compatibility with 1.9
 * Add version of S2K::derive_key taking salt and iteration count
 * Enable the /proc-walking entropy source on NetBSD
 * Fix the doxygen makefile target
diff --git a/src/lib/base/init.h b/src/lib/base/init.h
index b73355628..0c61eba6f 100644
--- a/src/lib/base/init.h
+++ b/src/lib/base/init.h
@@ -17,7 +17,7 @@ namespace Botan {
 * Previously botan had state whose lifetime had to be explicitly
 * managed by the application. As of 1.11.14 this is no longer the
 * case, and this class is no longer needed and kept only for backwards
-* compatability.
+* compatibility.
 */
 class BOTAN_DLL LibraryInitializer
    {
diff --git a/src/lib/base/transform.h b/src/lib/base/transform.h
index b5916a3a4..cd4ee9880 100644
--- a/src/lib/base/transform.h
+++ b/src/lib/base/transform.h
@@ -69,7 +69,7 @@ class BOTAN_DLL Transform
 
       /**
       * Process some data. Input must be in size update_granularity() byte blocks.
-      * @param blocks in/out paramter which will possibly be resized
+      * @param blocks in/out parameter which will possibly be resized
       * @param offset an offset into blocks to begin processing
       */
       virtual void update(secure_vector<byte>& blocks, size_t offset = 0) = 0;
diff --git a/src/lib/cert/x509/x509cert.h b/src/lib/cert/x509/x509cert.h
index 563b900f2..3bd444214 100644
--- a/src/lib/cert/x509/x509cert.h
+++ b/src/lib/cert/x509/x509cert.h
@@ -50,7 +50,7 @@ class BOTAN_DLL X509_Certificate : public X509_Object
 
       /**
       * Get a value for a specific subject_info parameter name.
-      * @param name the name of the paramter to look up. Possible names are
+      * @param name the name of the parameter to look up. Possible names are
       * "X509.Certificate.version", "X509.Certificate.serial",
       * "X509.Certificate.start", "X509.Certificate.end",
       * "X509.Certificate.v2.key_id", "X509.Certificate.public_key",
@@ -64,7 +64,7 @@ class BOTAN_DLL X509_Certificate : public X509_Object
 
       /**
       * Get a value for a specific subject_info parameter name.
-      * @param name the name of the paramter to look up. Possible names are
+      * @param name the name of the parameter to look up. Possible names are
       * "X509.Certificate.v2.key_id" or "X509v3.AuthorityKeyIdentifier".
       * @return value(s) of the specified parameter
       */
diff --git a/src/lib/cert/x509/x509path.h b/src/lib/cert/x509/x509path.h
index 6f3ab115f..f400641be 100644
--- a/src/lib/cert/x509/x509path.h
+++ b/src/lib/cert/x509/x509path.h
@@ -94,7 +94,7 @@ class BOTAN_DLL Path_Validation_Result
       const std::vector<X509_Certificate>& cert_path() const { return m_cert_path; }
 
       /**
-      * @return true iff the validation was succesful
+      * @return true iff the validation was successful
       */
       bool successful_validation() const;
 
diff --git a/src/lib/credentials/credentials_manager.h b/src/lib/credentials/credentials_manager.h
index af0021393..96e840d13 100644
--- a/src/lib/credentials/credentials_manager.h
+++ b/src/lib/credentials/credentials_manager.h
@@ -21,7 +21,7 @@ class BigInt;
 * Interface for a credentials manager.
 *
 * A type is a fairly static value that represents the general nature
-* of the transaction occuring. Currently used values are "tls-client"
+* of the transaction occurring. Currently used values are "tls-client"
 * and "tls-server". Context represents a hostname, email address,
 * username, or other identifier.
 */
@@ -34,7 +34,7 @@ class BOTAN_DLL Credentials_Manager
       * Return a list of the certificates of CAs that we trust in this
       * type/context.
       *
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       *
       * @param context specifies a context relative to type. For instance
       *        for type "tls-client", context specifies the servers name.
@@ -52,7 +52,7 @@ class BOTAN_DLL Credentials_Manager
       * std::exception with an informative what() result if the
       * certificate chain cannot be verified.
 
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param hostname specifies the purported hostname
       * @param cert_chain specifies a certificate chain leading to a
       *        trusted root CA certificate.
@@ -73,7 +73,7 @@ class BOTAN_DLL Credentials_Manager
       *                       "DSA", "ECDSA", etc), or empty if there
       *                       is no preference by the caller.
       *
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       *
       * @param context specifies a context relative to type.
       */
@@ -92,7 +92,7 @@ class BOTAN_DLL Credentials_Manager
       * @param cert_key_type specifies the type of key requested
       *                      ("RSA", "DSA", "ECDSA", etc)
       *
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       *
       * @param context specifies a context relative to type.
       */
@@ -112,7 +112,7 @@ class BOTAN_DLL Credentials_Manager
                                            const std::string& context);
 
       /**
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param context specifies a context relative to type.
       * @return true if we should attempt SRP authentication
       */
@@ -120,7 +120,7 @@ class BOTAN_DLL Credentials_Manager
                                const std::string& context);
 
       /**
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param context specifies a context relative to type.
       * @return identifier for client-side SRP auth, if available
                 for this type/context. Should return empty string
@@ -130,7 +130,7 @@ class BOTAN_DLL Credentials_Manager
                                          const std::string& context);
 
       /**
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param context specifies a context relative to type.
       * @param identifier specifies what identifier we want the
       *        password for. This will be a value previously returned
@@ -154,7 +154,7 @@ class BOTAN_DLL Credentials_Manager
                                 bool generate_fake_on_unknown);
 
       /**
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param context specifies a context relative to type.
       * @return the PSK identity hint for this type/context
       */
@@ -162,7 +162,7 @@ class BOTAN_DLL Credentials_Manager
                                             const std::string& context);
 
       /**
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param context specifies a context relative to type.
       * @param identity_hint was passed by the server (but may be empty)
       * @return the PSK identity we want to use
@@ -172,7 +172,7 @@ class BOTAN_DLL Credentials_Manager
                                        const std::string& identity_hint);
 
       /**
-      * @param type specifies the type of operation occuring
+      * @param type specifies the type of operation occurring
       * @param context specifies a context relative to type.
       * @param identity is a PSK identity previously returned by
                psk_identity for the same type and context.
diff --git a/src/lib/entropy/rdrand/rdrand.cpp b/src/lib/entropy/rdrand/rdrand.cpp
index 74876e203..178c52798 100644
--- a/src/lib/entropy/rdrand/rdrand.cpp
+++ b/src/lib/entropy/rdrand/rdrand.cpp
@@ -29,7 +29,7 @@ void Intel_Rdrand::poll(Entropy_Accumulator& accum)
    Even if backdoored, rdrand cannot harm us because the HMAC_RNG poll process
    is designed to handle arbitrarily large amounts of attacker known/chosen
    input (or even a reseed where every bit we reseeded with was attacker chosen),
-   as long as at least one seed occured with enough unknown-to-attacker entropy.
+   as long as at least one seed occurred with enough unknown-to-attacker entropy.
    */
    const double ENTROPY_ESTIMATE = 0.0;
    const size_t RDRAND_POLLS = 32;
diff --git a/src/lib/filters/pipe.h b/src/lib/filters/pipe.h
index ce91e9e82..b8d8c707c 100644
--- a/src/lib/filters/pipe.h
+++ b/src/lib/filters/pipe.h
@@ -39,7 +39,7 @@ class BOTAN_DLL Pipe : public DataSource
       struct BOTAN_DLL Invalid_Message_Number : public Invalid_Argument
          {
          /**
-         * @param where the error occured
+         * @param where the error occurred
          * @param msg the invalid message id that was used
          */
          Invalid_Message_Number(const std::string& where, message_id msg) :
diff --git a/src/lib/hash/has160/has160.h b/src/lib/hash/has160/has160.h
index 795b244c3..e7ad42e62 100644
--- a/src/lib/hash/has160/has160.h
+++ b/src/lib/hash/has160/has160.h
@@ -14,7 +14,7 @@ namespace Botan {
 
 /**
 * HAS-160, a Korean hash function standardized in
-* TTAS.KO-12.0011/R1. Used in conjuction with KCDSA
+* TTAS.KO-12.0011/R1. Used in conjunction with KCDSA
 */
 class BOTAN_DLL HAS_160 : public MDx_HashFunction
    {
diff --git a/src/lib/hash/skein/skein_512.h b/src/lib/hash/skein/skein_512.h
index 0b1ba319d..3ae9fcdc3 100644
--- a/src/lib/hash/skein/skein_512.h
+++ b/src/lib/hash/skein/skein_512.h
@@ -23,7 +23,7 @@ class BOTAN_DLL Skein_512 : public HashFunction
    public:
       /**
       * @param output_bits the output size of Skein in bits
-      * @param personalization is a string that will paramaterize the
+      * @param personalization is a string that will parameterize the
       * hash output
       */
       Skein_512(size_t output_bits = 512,
diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h
index 776884ad9..e3200ca9d 100644
--- a/src/lib/math/bigint/bigint.h
+++ b/src/lib/math/bigint/bigint.h
@@ -437,7 +437,7 @@ class BOTAN_DLL BigInt
      * Fill BigInt with a random number with size of bitsize
      *
      * If \p set_high_bit is true, the highest bit will be set, which causes
-     * the entropy to be \a bits-1. Otherwise the highest bit is randomly choosen
+     * the entropy to be \a bits-1. Otherwise the highest bit is randomly chosen
      * by the rng, causing the entropy to be \a bits.
      *
      * @param rng the random number generator to use
diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.h b/src/lib/pbkdf/pbkdf1/pbkdf1.h
index c93dbe503..f776bb450 100644
--- a/src/lib/pbkdf/pbkdf1/pbkdf1.h
+++ b/src/lib/pbkdf/pbkdf1/pbkdf1.h
@@ -16,7 +16,7 @@ namespace Botan {
 /**
 * PKCS #5 v1 PBKDF, aka PBKDF1
 * Can only generate a key up to the size of the hash output.
-* Unless needed for backwards compatability, use PKCS5_PBKDF2
+* Unless needed for backwards compatibility, use PKCS5_PBKDF2
 */
 class BOTAN_DLL PKCS5_PBKDF1 : public PBKDF
    {
diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
index d279b8843..90af17565 100644
--- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
+++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
@@ -46,17 +46,17 @@ secure_vector<byte> EME_PKCS1v15::unpad(const byte in[], size_t inlen,
    if(inlen != key_len / 8 || inlen < 10 || in[0] != 0x02)
       throw Decoding_Error("PKCS1::unpad");
 
-   size_t seperator = 0;
+   size_t separator = 0;
    for(size_t j = 0; j != inlen; ++j)
       if(in[j] == 0)
          {
-         seperator = j;
+         separator = j;
          break;
          }
-   if(seperator < 9)
+   if(separator < 9)
       throw Decoding_Error("PKCS1::unpad");
 
-   return secure_vector<byte>(&in[seperator + 1], &in[inlen]);
+   return secure_vector<byte>(&in[separator + 1], &in[inlen]);
    }
 
 /*
diff --git a/src/lib/pubkey/ec_group/ec_group.h b/src/lib/pubkey/ec_group/ec_group.h
index 5e2800dc5..67ade0c65 100644
--- a/src/lib/pubkey/ec_group/ec_group.h
+++ b/src/lib/pubkey/ec_group/ec_group.h
@@ -140,7 +140,7 @@ inline bool operator!=(const EC_Group& lhs,
    return !(lhs == rhs);
    }
 
-// For compatability with 1.8
+// For compatibility with 1.8
 typedef EC_Group EC_Domain_Params;
 
 }
diff --git a/src/lib/pubkey/mce/polyn_gf2m.cpp b/src/lib/pubkey/mce/polyn_gf2m.cpp
index 35ae8ffee..9b3366757 100644
--- a/src/lib/pubkey/mce/polyn_gf2m.cpp
+++ b/src/lib/pubkey/mce/polyn_gf2m.cpp
@@ -555,7 +555,7 @@ std::pair<polyn_gf2m, polyn_gf2m> polyn_gf2m::eea_with_coefficients( const polyn
             * candiate. If they are all fulfilled, then we know that we have a low
             * weight error vector, since the key-equation solving EEA is skipped if
             * the degree of tau^2 is low (=m_deg(u0)) and all its odd cofficients are
-            * zero (they would cause "full-lenght" contributions from the square
+            * zero (they would cause "full-length" contributions from the square
             * root computation).
             */
             // Condition for the coefficient to Y to be cancelled out by the
diff --git a/src/tests/nist_x509.cpp b/src/tests/nist_x509.cpp
index 8769d3ce2..04b569d32 100644
--- a/src/tests/nist_x509.cpp
+++ b/src/tests/nist_x509.cpp
@@ -212,14 +212,14 @@ std::map<size_t, Path_Validation_Result::Code> get_expected()
 
     In the case of the tests currently in the suite, the default
     method (with acceptable policy being "any-policy" and with no
-    explict policy required), will almost always result in a verified
+    explicit policy required), will almost always result in a verified
     status. This is not particularly helpful. So, we should do several
     different tests for each test set:
 
        1) With the user policy as any-policy and no explicit policy
        2) With the user policy as any-policy and an explicit policy required
        3) With the user policy as test-policy-1 (2.16.840.1.101.3.1.48.1) and
-          an explict policy required
+          an explicit policy required
        4) With the user policy as either test-policy-1 or test-policy-2 and an
           explicit policy required
 
@@ -238,9 +238,9 @@ std::map<size_t, Path_Validation_Result::Code> get_expected()
    expected_results[43] = Certificate_Status_Code::VERIFIED;
    expected_results[44] = Certificate_Status_Code::VERIFIED;
 
-   //expected_results[45] = Certificate_Status_Code::EXPLICT_POLICY_REQUIRED;
+   //expected_results[45] = Certificate_Status_Code::EXPLICIT_POLICY_REQUIRED;
    //expected_results[46] = Certificate_Status_Code::ACCEPT;
-   //expected_results[47] = Certificate_Status_Code::EXPLICT_POLICY_REQUIRED;
+   //expected_results[47] = Certificate_Status_Code::EXPLICIT_POLICY_REQUIRED;
 
    expected_results[48] = Certificate_Status_Code::VERIFIED;
    expected_results[49] = Certificate_Status_Code::VERIFIED;