aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-10-22 13:33:48 -0400
committerJack Lloyd <[email protected]>2016-10-22 13:33:48 -0400
commit9033015bb94be08dc76f1bc2138cd85500bad831 (patch)
treeb7705315c813752c195903522d05c3e37a376e58 /src/lib
parentf1557cb19dfb1220ddf994c931c148d83beb2390 (diff)
Address some Coverity warnings
Nothing exciting.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffi/ffi.cpp2
-rw-r--r--src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp2
-rw-r--r--src/lib/tls/tls_ciphersuite.h14
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp
index 88a34c3cc..3a943378d 100644
--- a/src/lib/ffi/ffi.cpp
+++ b/src/lib/ffi/ffi.cpp
@@ -743,7 +743,7 @@ int botan_privkey_create(botan_privkey_t* key_obj,
if(algo_name == nullptr)
algo_name = "RSA";
if(algo_params == nullptr)
- algo_name = "";
+ algo_params = "";
*key_obj = nullptr;
diff --git a/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp b/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp
index a7261a522..bf01cc879 100644
--- a/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp
+++ b/src/lib/stream/chacha/chacha_sse2/chacha_sse2.cpp
@@ -12,7 +12,7 @@ namespace Botan {
//static
BOTAN_FUNC_ISA("sse2")
-void ChaCha::chacha_sse2_x4(byte output[64], u32bit input[16], size_t rounds)
+void ChaCha::chacha_sse2_x4(byte output[64*4], u32bit input[16], size_t rounds)
{
BOTAN_ASSERT(rounds % 2 == 0, "Valid rounds");
diff --git a/src/lib/tls/tls_ciphersuite.h b/src/lib/tls/tls_ciphersuite.h
index 6708e3ca6..fe3392a38 100644
--- a/src/lib/tls/tls_ciphersuite.h
+++ b/src/lib/tls/tls_ciphersuite.h
@@ -118,7 +118,7 @@ class BOTAN_DLL Ciphersuite
private:
bool is_usable() const;
-
+
Ciphersuite(u16bit ciphersuite_code,
const char* iana_id,
const char* sig_algo,
@@ -151,14 +151,14 @@ class BOTAN_DLL Ciphersuite
All of these const char* strings are references to compile time
constants in tls_suite_info.cpp
*/
- const char* m_iana_id;
+ const char* m_iana_id = nullptr;
- const char* m_sig_algo;
- const char* m_kex_algo;
- const char* m_prf_algo;
+ const char* m_sig_algo = nullptr;
+ const char* m_kex_algo = nullptr;
+ const char* m_prf_algo = nullptr;
- const char* m_cipher_algo;
- const char* m_mac_algo;
+ const char* m_cipher_algo = nullptr;
+ const char* m_mac_algo = nullptr;
size_t m_cipher_keylen = 0;
size_t m_nonce_bytes_from_handshake = 0;