Fix various typos, and remove an unused macro in checks/bench.cpp

All reported by Patrick Pelletier.

8 files changed, 8 insertions, 20 deletions

diff --git a/checks/bench.cpp b/checks/bench.cpp
index e9eb92199..21b568902 100644
--- a/checks/bench.cpp
+++ b/checks/bench.cpp
@@ -150,18 +150,6 @@ void report_results(const std::string& algo,
 
    std::cout << algo;
 
-#if defined(__SUNPRO_CC)
-  #define REVERSE_ITERATOR_BUG 1
-#elif defined(__GNUC__) && __GNUC__ <= 3
-  #define REVERSE_ITERATOR_BUG 1
-#elif defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 0)
-  #define REVERSE_ITERATOR_BUG 1
-#endif
-
-#ifndef REVERSE_ITERATOR_BUG
-  #define REVERSE_ITERATOR_BUG 0
-#endif
-
 #if (defined(__GNUC__) && __GNUC__ <= 3) || defined(__SUNPRO_CC)
    // Work around GCC 3.x bug, reverse iterators don't work
    for(std::map<double, std::string>::const_iterator i = results.begin(); i != results.end(); ++i)
diff --git a/checks/validate.cpp b/checks/validate.cpp
index 3de081d56..2bb099030 100644
--- a/checks/validate.cpp
+++ b/checks/validate.cpp
@@ -341,7 +341,7 @@ u32bit do_validation_tests(const std::string& filename,
          if(should_pass)
             std::cout << "Testing " << algorithm << "..." << std::endl;
          else
-            std::cout << "Testing (expecing failure) "
+            std::cout << "Testing (expecting failure) "
                       << algorithm << "..." << std::endl;
 #endif
          alg_count = 0;
diff --git a/src/cert/cvc/cvc_req.h b/src/cert/cvc/cvc_req.h
index 1e8cea7f8..ac4e22453 100644
--- a/src/cert/cvc/cvc_req.h
+++ b/src/cert/cvc/cvc_req.h
@@ -35,7 +35,7 @@ class BOTAN_DLL EAC1_1_Req : public EAC1_1_gen_CVC<EAC1_1_Req>
       EAC1_1_Req(DataSource& source);
 
       /**
-      * Construct a CVC request from a DER encoded CVC reqeust file.
+      * Construct a CVC request from a DER encoded CVC request file.
       * @param str the path to the DER encoded file
       */
       EAC1_1_Req(const std::string& str);
diff --git a/src/engine/asm_engine/asm_engine.h b/src/engine/asm_engine/asm_engine.h
index bd82566d3..40fe5342f 100644
--- a/src/engine/asm_engine/asm_engine.h
+++ b/src/engine/asm_engine/asm_engine.h
@@ -23,7 +23,7 @@ class Assembler_Engine : public Engine
       BlockCipher* find_block_cipher(const SCAN_Name&,
                                      Algorithm_Factory&) const;
 
-      HashFunction* find_hash(const SCAN_Name& reqeust,
+      HashFunction* find_hash(const SCAN_Name& request,
                               Algorithm_Factory&) const;
    };
 
diff --git a/src/engine/core_engine/core_engine.h b/src/engine/core_engine/core_engine.h
index 5386991c3..983b75290 100644
--- a/src/engine/core_engine/core_engine.h
+++ b/src/engine/core_engine/core_engine.h
@@ -44,10 +44,10 @@ class Core_Engine : public Engine
       StreamCipher* find_stream_cipher(const SCAN_Name&,
                                        Algorithm_Factory&) const;
 
-      HashFunction* find_hash(const SCAN_Name& reqeust,
+      HashFunction* find_hash(const SCAN_Name& request,
                               Algorithm_Factory&) const;
 
-      MessageAuthenticationCode* find_mac(const SCAN_Name& reqeust,
+      MessageAuthenticationCode* find_mac(const SCAN_Name& request,
                                           Algorithm_Factory&) const;
 
       PBKDF* find_pbkdf(const SCAN_Name& algo_spec,
diff --git a/src/engine/openssl/ossl_arc4.cpp b/src/engine/openssl/ossl_arc4.cpp
index 0b1f7f1f3..0c524003d 100644
--- a/src/engine/openssl/ossl_arc4.cpp
+++ b/src/engine/openssl/ossl_arc4.cpp
@@ -71,7 +71,7 @@ void ARC4_OpenSSL::cipher(const byte in[], byte out[], size_t length)
 }
 
 /**
-* Look for an OpenSSL-suported stream cipher (ARC4)
+* Look for an OpenSSL-supported stream cipher (ARC4)
 */
 StreamCipher*
 OpenSSL_Engine::find_stream_cipher(const SCAN_Name& request,
diff --git a/src/engine/simd_engine/simd_engine.h b/src/engine/simd_engine/simd_engine.h
index 73f7d2233..66c8886f1 100644
--- a/src/engine/simd_engine/simd_engine.h
+++ b/src/engine/simd_engine/simd_engine.h
@@ -23,7 +23,7 @@ class SIMD_Engine : public Engine
       BlockCipher* find_block_cipher(const SCAN_Name&,
                                      Algorithm_Factory&) const;
 
-      HashFunction* find_hash(const SCAN_Name& reqeust,
+      HashFunction* find_hash(const SCAN_Name& request,
                               Algorithm_Factory&) const;
    };
 
diff --git a/src/libstate/init.cpp b/src/libstate/init.cpp
index 7cdc615bd..6d1ca1dbc 100644
--- a/src/libstate/init.cpp
+++ b/src/libstate/init.cpp
@@ -51,7 +51,7 @@ void LibraryInitializer::initialize(const std::string& arg_string)
       /*
       This two stage initialization process is because Library_State's
       constructor will implicitly refer to global state through the
-      allocators and so for, so global_state() has to be a valid
+      allocators and so forth, so global_state() has to be a valid
       reference before initialize() can be called. Yeah, gross.
       */
       Global_State_Management::set_global_state(new Library_State);