diff options
| -rw-r--r-- | src/algo_factory/algo_cache.h | 11 | ||||
| -rw-r--r-- | src/algo_factory/algo_factory.cpp | 3 | ||||
| -rw-r--r-- | src/filters/filter.h | 4 | ||||
| -rw-r--r-- | src/math/bigint/bigint.h | 3 | ||||
| -rw-r--r-- | src/rng/hmac_rng/hmac_rng.cpp | 4 |
5 files changed, 18 insertions, 7 deletions
diff --git a/src/algo_factory/algo_cache.h b/src/algo_factory/algo_cache.h index a77828718..699078b03 100644 --- a/src/algo_factory/algo_cache.h +++ b/src/algo_factory/algo_cache.h @@ -29,7 +29,9 @@ class Algorithm_Cache Algorithm_Cache(Mutex* m) : mutex(m) {} ~Algorithm_Cache(); private: - typedef typename std::map<std::string, std::map<std::string, T*> >::iterator algorithms_iterator; + typedef typename std::map<std::string, std::map<std::string, T*> >::iterator + algorithms_iterator; + typedef typename std::map<std::string, T*>::iterator provider_iterator; algorithms_iterator find_algorithm(const std::string& algo_spec); @@ -76,7 +78,7 @@ const T* Algorithm_Cache<T>::get(const SCAN_Name& request) const std::string requested_provider = request.provider(); - if(requested_provider != "") // If a specific request, allow that provider or core + if(requested_provider != "") { provider_iterator provider = algo->second.find(requested_provider); @@ -115,8 +117,11 @@ void Algorithm_Cache<T>::add(T* algo, delete algorithms[algo->name()][provider]; algorithms[algo->name()][provider] = algo; - if(algo->name() != requested_name && aliases.find(requested_name) == aliases.end()) + if(algo->name() != requested_name && + aliases.find(requested_name) == aliases.end()) + { aliases[requested_name] = algo->name(); + } } /** diff --git a/src/algo_factory/algo_factory.cpp b/src/algo_factory/algo_factory.cpp index cc2601496..e69b85b15 100644 --- a/src/algo_factory/algo_factory.cpp +++ b/src/algo_factory/algo_factory.cpp @@ -212,7 +212,8 @@ Algorithm_Factory::prototype_mac(const SCAN_Name& request) SCAN_Name request_i(request.as_string(), provider); - if(MessageAuthenticationCode* impl = engines[i]->find_mac(request_i, *this)) + if(MessageAuthenticationCode* impl = + engines[i]->find_mac(request_i, *this)) mac_cache.add(impl, request.as_string(), provider); } diff --git a/src/filters/filter.h b/src/filters/filter.h index 5be22a584..0a235978d 100644 --- a/src/filters/filter.h +++ b/src/filters/filter.h @@ -80,7 +80,9 @@ class BOTAN_DLL Filter SecureVector<byte> write_queue; std::vector<Filter*> next; u32bit port_num, filter_owns; - bool owned; // true if filter belongs to a pipe --> prohibit filter sharing! + + // true if filter belongs to a pipe --> prohibit filter sharing! + bool owned; }; /** diff --git a/src/math/bigint/bigint.h b/src/math/bigint/bigint.h index 087f0e25a..4a29e5365 100644 --- a/src/math/bigint/bigint.h +++ b/src/math/bigint/bigint.h @@ -401,7 +401,8 @@ class BOTAN_DLL BigInt * @param base number-base of the integer in buf * @result BigInt-representing the given integer read from the byte array */ - static BigInt decode(const byte buf[], u32bit length, Base base = Binary); + static BigInt decode(const byte buf[], u32bit length, + Base base = Binary); static BigInt decode(const MemoryRegion<byte>&, Base = Binary); diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp index ffc5549e2..d85cebada 100644 --- a/src/rng/hmac_rng/hmac_rng.cpp +++ b/src/rng/hmac_rng/hmac_rng.cpp @@ -68,7 +68,9 @@ void HMAC_RNG::randomize(byte out[], u32bit length) /* Every once in a while do a fast poll of a entropy source */ if(entropy_sources.size() && (counter % 65536 == 0)) { - u32bit got = entropy_sources.at(source_index)->fast_poll(io_buffer, io_buffer.size()); + u32bit got = entropy_sources.at(source_index)-> + fast_poll(io_buffer, io_buffer.size()); + source_index = (source_index + 1) % entropy_sources.size(); extractor->update(io_buffer, got); } |