diff options
| -rw-r--r-- | src/crypto/crypto.cpp | 4 | ||||
| -rw-r--r-- | src/crypto/crypto.h | 1 | ||||
| -rw-r--r-- | tests/unit_tests/crypto.cpp | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp index 36b510a5b..a2db14e08 100644 --- a/src/crypto/crypto.cpp +++ b/src/crypto/crypto.cpp @@ -70,8 +70,8 @@ namespace crypto { #include "random.h" } - const crypto::public_key null_pkey = boost::value_initialized<crypto::public_key>(); - const crypto::secret_key null_skey = boost::value_initialized<crypto::secret_key>(); + const crypto::public_key null_pkey = crypto::public_key{}; + const crypto::secret_key null_skey = crypto::secret_key{}; static inline unsigned char *operator &(ec_point &point) { return &reinterpret_cast<unsigned char &>(point); diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index 492bf966e..073707876 100644 --- a/src/crypto/crypto.h +++ b/src/crypto/crypto.h @@ -34,7 +34,6 @@ #include <iostream> #include <boost/thread/mutex.hpp> #include <boost/thread/lock_guard.hpp> -#include <boost/utility/value_init.hpp> #include <boost/optional.hpp> #include <type_traits> #include <vector> diff --git a/tests/unit_tests/crypto.cpp b/tests/unit_tests/crypto.cpp index 4bed06173..9e1680568 100644 --- a/tests/unit_tests/crypto.cpp +++ b/tests/unit_tests/crypto.cpp @@ -73,3 +73,11 @@ TEST(Crypto, Ostream) EXPECT_TRUE(is_formatted<crypto::key_derivation>()); EXPECT_TRUE(is_formatted<crypto::key_image>()); } + +TEST(Crypto, null_keys) +{ + char zero[32]; + memset(zero, 0, 32); + ASSERT_EQ(memcmp(crypto::null_skey.data, zero, 32), 0); + ASSERT_EQ(memcmp(crypto::null_pkey.data, zero, 32), 0); +} |