From cabab23e2c4a57d525aecd65dab0805a1c753714 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Fri, 2 Aug 2019 17:17:13 +0200 Subject: [PATCH] Replaced more array::begin() with data() --- src/crypto/elliptic_impl_priv.cpp | 2 +- tests/crypto/ecc_test.cpp | 8 ++++---- tests/hmac_test.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crypto/elliptic_impl_priv.cpp b/src/crypto/elliptic_impl_priv.cpp index 96ce6e4..3263927 100644 --- a/src/crypto/elliptic_impl_priv.cpp +++ b/src/crypto/elliptic_impl_priv.cpp @@ -98,7 +98,7 @@ namespace fc { namespace ecc { result.data() + 1, (unsigned char*) my->_key.data(), extended_nonce_function, &counter, &recid )); } while( require_canonical && !public_key::is_canonical( result ) ); - result.begin()[0] = 27 + 4 + recid; + result.data()[0] = 27 + 4 + recid; return result; } diff --git a/tests/crypto/ecc_test.cpp b/tests/crypto/ecc_test.cpp index 94028ae..79ac1e1 100644 --- a/tests/crypto/ecc_test.cpp +++ b/tests/crypto/ecc_test.cpp @@ -23,7 +23,7 @@ static void interop_do(const char * const data, size_t len) { } static void interop_do(const fc::ecc::public_key_data &data) { - interop_do((char*) data.begin(), data.size()); + interop_do((char*) data.data(), data.size()); } static void interop_do(const fc::ecc::private_key_secret &data) { @@ -31,7 +31,7 @@ static void interop_do(const fc::ecc::private_key_secret &data) { } static void interop_do(const fc::ecc::public_key_point_data &data) { - interop_do((char*) data.begin(), data.size()); + interop_do((char*) data.data(), data.size()); } static void interop_do(const std::string &data) { @@ -44,11 +44,11 @@ static void interop_do(const fc::sha512 &data) { static void interop_do(fc::ecc::compact_signature &data) { if (write_mode) { - interop_data.write((char*) data.begin(), data.size()); + interop_data.write((char*) data.data(), data.size()); return; } - interop_data.read((char*) data.begin(), data.size()); + interop_data.read((char*) data.data(), data.size()); } static void interop_file(const char * const name) { diff --git a/tests/hmac_test.cpp b/tests/hmac_test.cpp index 82079be..fdd1e4c 100644 --- a/tests/hmac_test.cpp +++ b/tests/hmac_test.cpp @@ -79,13 +79,13 @@ static void run_test( const std::string& key, const std::string& data, const std { std::array key_arr; - BOOST_CHECK_EQUAL( fc::from_hex( key, key_arr.begin(), key_arr.size() ), N ); + BOOST_CHECK_EQUAL( fc::from_hex( key, key_arr.data(), key_arr.size() ), N ); std::array data_arr; - BOOST_CHECK_EQUAL( fc::from_hex( data, data_arr.begin(), data_arr.size() ), M ); + BOOST_CHECK_EQUAL( fc::from_hex( data, data_arr.data(), data_arr.size() ), M ); - BOOST_CHECK_EQUAL( mac_224.digest( key_arr.begin(), N, data_arr.begin(), M ).str(), expect_224 ); - BOOST_CHECK_EQUAL( mac_256.digest( key_arr.begin(), N, data_arr.begin(), M ).str(), expect_256 ); - BOOST_CHECK_EQUAL( mac_512.digest( key_arr.begin(), N, data_arr.begin(), M ).str(), expect_512 ); + BOOST_CHECK_EQUAL( mac_224.digest( key_arr.data(), N, data_arr.data(), M ).str(), expect_224 ); + BOOST_CHECK_EQUAL( mac_256.digest( key_arr.data(), N, data_arr.data(), M ).str(), expect_256 ); + BOOST_CHECK_EQUAL( mac_512.digest( key_arr.data(), N, data_arr.data(), M ).str(), expect_512 ); } BOOST_AUTO_TEST_CASE(hmac_test_1)