diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/base/init.h | 2 | ||||
-rw-r--r-- | src/lib/base/transform.h | 2 | ||||
-rw-r--r-- | src/lib/cert/x509/x509cert.h | 4 | ||||
-rw-r--r-- | src/lib/cert/x509/x509path.h | 2 | ||||
-rw-r--r-- | src/lib/credentials/credentials_manager.h | 22 | ||||
-rw-r--r-- | src/lib/entropy/rdrand/rdrand.cpp | 2 | ||||
-rw-r--r-- | src/lib/filters/pipe.h | 2 | ||||
-rw-r--r-- | src/lib/hash/has160/has160.h | 2 | ||||
-rw-r--r-- | src/lib/hash/skein/skein_512.h | 2 | ||||
-rw-r--r-- | src/lib/math/bigint/bigint.h | 2 | ||||
-rw-r--r-- | src/lib/pbkdf/pbkdf1/pbkdf1.h | 2 | ||||
-rw-r--r-- | src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp | 8 | ||||
-rw-r--r-- | src/lib/pubkey/ec_group/ec_group.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/mce/polyn_gf2m.cpp | 2 | ||||
-rw-r--r-- | src/tests/nist_x509.cpp | 8 |
15 files changed, 32 insertions, 32 deletions
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; |