diff options
author | Jack Lloyd <lloyd@randombit.net> | 2015-09-21 12:24:08 -0400 |
---|---|---|
committer | Jack Lloyd <lloyd@randombit.net> | 2015-09-21 12:24:08 -0400 |
commit | 408ea0a9b8ed0f575f8ee26891473920b42ef026 (patch) | |
tree | e0c6e3f0cec52bc7389a1d3e6de45bf959960535 | |
parent | e94e615e528e73f2a9354291d844514b4e1c0636 (diff) |
Address some review comments by Simon. GH #279
-rw-r--r-- | src/lib/block/block_cipher.cpp | 2 | ||||
-rw-r--r-- | src/lib/block/block_cipher.h | 2 | ||||
-rw-r--r-- | src/lib/hash/hash.h | 2 | ||||
-rw-r--r-- | src/lib/kdf/kdf.h | 2 | ||||
-rw-r--r-- | src/lib/mac/mac.h | 2 | ||||
-rw-r--r-- | src/lib/modes/aead/aead.cpp | 12 | ||||
-rw-r--r-- | src/lib/modes/cipher_mode.cpp | 8 | ||||
-rw-r--r-- | src/lib/pbkdf/pbkdf.h | 2 | ||||
-rw-r--r-- | src/lib/stream/stream_cipher.cpp | 10 | ||||
-rw-r--r-- | src/lib/stream/stream_cipher.h | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp index e4d6c5817..5b9c4f0ba 100644 --- a/src/lib/block/block_cipher.cpp +++ b/src/lib/block/block_cipher.cpp @@ -10,7 +10,7 @@ #include <botan/internal/algo_registry.h> #if defined(BOTAN_HAS_SIMD_32) -#include <botan/internal/simd_32.h> + #include <botan/internal/simd_32.h> #endif #if defined(BOTAN_HAS_AES) diff --git a/src/lib/block/block_cipher.h b/src/lib/block/block_cipher.h index cea07ac2d..0f4c2c1c5 100644 --- a/src/lib/block/block_cipher.h +++ b/src/lib/block/block_cipher.h @@ -24,7 +24,7 @@ class BOTAN_DLL BlockCipher : public SymmetricAlgorithm /** * Create an instance based on a name * Will return a null pointer if the algo/provider combination cannot - * be found. If providers is empty then best available is chosen. + * be found. If provider is empty then best available is chosen. */ static std::unique_ptr<BlockCipher> create(const std::string& algo_spec, const std::string& provider = ""); diff --git a/src/lib/hash/hash.h b/src/lib/hash/hash.h index 76c9d5cd7..ac1c22a65 100644 --- a/src/lib/hash/hash.h +++ b/src/lib/hash/hash.h @@ -25,7 +25,7 @@ class BOTAN_DLL HashFunction : public Buffered_Computation /** * Create an instance based on a name * Will return a null pointer if the algo/provider combination cannot - * be found. If providers is empty then best available is chosen. + * be found. If provider is empty then best available is chosen. */ static std::unique_ptr<HashFunction> create(const std::string& algo_spec, const std::string& provider = ""); diff --git a/src/lib/kdf/kdf.h b/src/lib/kdf/kdf.h index a8d4650e0..88b50c8b8 100644 --- a/src/lib/kdf/kdf.h +++ b/src/lib/kdf/kdf.h @@ -26,7 +26,7 @@ class BOTAN_DLL KDF /** * Create an instance based on a name * Will return a null pointer if the algo/provider combination cannot - * be found. If providers is empty then best available is chosen. + * be found. If provider is empty then best available is chosen. */ static std::unique_ptr<KDF> create(const std::string& algo_spec, const std::string& provider = ""); diff --git a/src/lib/mac/mac.h b/src/lib/mac/mac.h index 6f18fce19..90ef4db15 100644 --- a/src/lib/mac/mac.h +++ b/src/lib/mac/mac.h @@ -27,7 +27,7 @@ class BOTAN_DLL MessageAuthenticationCode : public Buffered_Computation, /** * Create an instance based on a name * Will return a null pointer if the algo/provider combination cannot - * be found. If providers is empty then best available is chosen. + * be found. If provider is empty then best available is chosen. */ static std::unique_ptr<MessageAuthenticationCode> create(const std::string& algo_spec, const std::string& provider = ""); diff --git a/src/lib/modes/aead/aead.cpp b/src/lib/modes/aead/aead.cpp index 600e0eb18..1e66dbd43 100644 --- a/src/lib/modes/aead/aead.cpp +++ b/src/lib/modes/aead/aead.cpp @@ -9,27 +9,27 @@ #include <botan/lookup.h> #if defined(BOTAN_HAS_AEAD_CCM) -#include <botan/ccm.h> + #include <botan/ccm.h> #endif #if defined(BOTAN_HAS_AEAD_CHACHA20_POLY1305) -#include <botan/chacha20poly1305.h> + #include <botan/chacha20poly1305.h> #endif #if defined(BOTAN_HAS_AEAD_EAX) -#include <botan/eax.h> + #include <botan/eax.h> #endif #if defined(BOTAN_HAS_AEAD_GCM) -#include <botan/gcm.h> + #include <botan/gcm.h> #endif #if defined(BOTAN_HAS_AEAD_OCB) -#include <botan/ocb.h> + #include <botan/ocb.h> #endif #if defined(BOTAN_HAS_AEAD_SIV) -#include <botan/siv.h> + #include <botan/siv.h> #endif namespace Botan { diff --git a/src/lib/modes/cipher_mode.cpp b/src/lib/modes/cipher_mode.cpp index 98e2218dc..262c41434 100644 --- a/src/lib/modes/cipher_mode.cpp +++ b/src/lib/modes/cipher_mode.cpp @@ -12,19 +12,19 @@ #include <sstream> #if defined(BOTAN_HAS_MODE_ECB) -#include <botan/ecb.h> + #include <botan/ecb.h> #endif #if defined(BOTAN_HAS_MODE_CBC) -#include <botan/cbc.h> + #include <botan/cbc.h> #endif #if defined(BOTAN_HAS_MODE_CFB) -#include <botan/cfb.h> + #include <botan/cfb.h> #endif #if defined(BOTAN_HAS_MODE_XTS) -#include <botan/xts.h> + #include <botan/xts.h> #endif namespace Botan { diff --git a/src/lib/pbkdf/pbkdf.h b/src/lib/pbkdf/pbkdf.h index 1a1299c75..495da0ac9 100644 --- a/src/lib/pbkdf/pbkdf.h +++ b/src/lib/pbkdf/pbkdf.h @@ -27,7 +27,7 @@ class BOTAN_DLL PBKDF /** * Create an instance based on a name * Will return a null pointer if the algo/provider combination cannot - * be found. If providers is empty then best available is chosen. + * be found. If provider is empty then best available is chosen. */ static std::unique_ptr<PBKDF> create(const std::string& algo_spec, const std::string& provider = ""); diff --git a/src/lib/stream/stream_cipher.cpp b/src/lib/stream/stream_cipher.cpp index 91b68b38a..060e65d86 100644 --- a/src/lib/stream/stream_cipher.cpp +++ b/src/lib/stream/stream_cipher.cpp @@ -9,23 +9,23 @@ #include <botan/internal/algo_registry.h> #if defined(BOTAN_HAS_CHACHA) -#include <botan/chacha.h> + #include <botan/chacha.h> #endif #if defined(BOTAN_HAS_SALSA20) -#include <botan/salsa20.h> + #include <botan/salsa20.h> #endif #if defined(BOTAN_HAS_CTR_BE) -#include <botan/ctr.h> + #include <botan/ctr.h> #endif #if defined(BOTAN_HAS_OFB) -#include <botan/ofb.h> + #include <botan/ofb.h> #endif #if defined(BOTAN_HAS_RC4) -#include <botan/rc4.h> + #include <botan/rc4.h> #endif namespace Botan { diff --git a/src/lib/stream/stream_cipher.h b/src/lib/stream/stream_cipher.h index 68c97f1c1..8c9b28147 100644 --- a/src/lib/stream/stream_cipher.h +++ b/src/lib/stream/stream_cipher.h @@ -25,7 +25,7 @@ class BOTAN_DLL StreamCipher : public SymmetricAlgorithm /** * Create an instance based on a name * Will return a null pointer if the algo/provider combination cannot - * be found. If providers is empty then best available is chosen. + * be found. If provider is empty then best available is chosen. */ static std::unique_ptr<StreamCipher> create(const std::string& algo_spec, const std::string& provider = ""); |