Merge pull request #2860

3dffe71b new wipeable_string class to replace std::string passphrases (moneromooo-monero)
7a2a5741 utils: initialize easylogging++ in on_startup (moneromooo-monero)
54950829 use memwipe in a few relevant places (moneromooo-monero)
000666ff add a memwipe function (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-12-16 23:19:27 +02:00
commit 6c0953b15a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
22 changed files with 528 additions and 69 deletions

View file

@ -50,6 +50,7 @@ set(unit_tests_sources
hashchain.cpp
http.cpp
main.cpp
memwipe.cpp
mnemonics.cpp
mul_div.cpp
parse_amount.cpp
@ -101,6 +102,8 @@ if (NOT MSVC)
COMPILE_FLAGS " -Wno-undef -Wno-sign-compare")
endif ()
SET_PROPERTY(SOURCE memwipe.cpp PROPERTY COMPILE_FLAGS -Ofast)
add_test(
NAME unit_tests
COMMAND unit_tests --data-dir "${TEST_DATA_DIR}")

View file

@ -211,7 +211,7 @@ std::string get_a1(const http::login& user, const fields& src)
{
const std::string& realm = src.at(u8"realm");
return boost::join(
std::vector<std::string>{user.username, realm, user.password}, u8":"
std::vector<std::string>{user.username, realm, std::string(user.password.data(), user.password.size())}, u8":"
);
}

View file

@ -0,0 +1,64 @@
// Copyright (c) 2017, The Monero Project
//
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
//
// 3. Neither the name of the copyright holder nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "gtest/gtest.h"
#include <stdint.h>
#include "misc_log_ex.h"
#include "common/memwipe.h"
// Probably won't catch the optimized out case, but at least we test
// it works in the normal case
static void test(bool wipe)
{
char *foo = (char*)malloc(4);
ASSERT_TRUE(foo != NULL);
intptr_t foop = (intptr_t)foo;
strcpy(foo, "bar");
void *bar = wipe ? memwipe(foo, 3) : memset(foo, 0, 3);
ASSERT_EQ(foo, bar);
free(foo);
char *quux = (char*)malloc(4); // same size, just after free, so we're likely to get the same, depending on the allocator
if ((intptr_t)quux == foop)
{
MDEBUG(std::hex << std::setw(8) << std::setfill('0') << *(uint32_t*)quux);
if (wipe) ASSERT_TRUE(!memcmp(quux, "\0\0\0", 3));
}
else MWARNING("We did not get the same location, cannot check");
free(quux);
}
TEST(memwipe, control)
{
test(false);
}
TEST(memwipe, works)
{
test(true);
}