add and use constant time 32 byte equality function

This commit is contained in:
moneromooo-monero 2018-06-13 18:23:06 +01:00 committed by wowario
parent 993a55246e
commit c0f02c85b5
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
9 changed files with 138 additions and 15 deletions

View file

@ -0,0 +1,72 @@
// Copyright (c) 2014-2018, 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.
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#pragma once
#include <string.h>
#include <sodium/crypto_verify_32.h>
struct memcmp32
{
static const size_t loop_count = 1000000000;
static int call(const unsigned char *k0, const unsigned char *k1){ return memcmp(k0, k1, 32); }
};
struct verify32
{
static const size_t loop_count = 10000000;
static int call(const unsigned char *k0, const unsigned char *k1){ return crypto_verify_32(k0, k1); }
};
template<typename f, bool equal>
class test_equality
{
public:
static const size_t loop_count = f::loop_count;
bool init()
{
for (int n = 0; n < 32; ++n)
k0[n] = n;
for (int n = 0; n < 32; ++n)
k1[n] = equal ? n : n + 1;
return true;
}
bool test()
{
return equal == !f::call(k0, k1);
}
private:
unsigned char k0[32];
unsigned char k1[32];
};

View file

@ -51,6 +51,7 @@
#include "sc_reduce32.h"
#include "cn_fast_hash.h"
#include "rct_mlsag.h"
#include "equality.h"
namespace po = boost::program_options;
@ -170,6 +171,11 @@ int main(int argc, char** argv)
TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 10, true);
TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 100, true);
TEST_PERFORMANCE2(filter, test_equality, memcmp32, true);
TEST_PERFORMANCE2(filter, test_equality, memcmp32, false);
TEST_PERFORMANCE2(filter, test_equality, verify32, false);
TEST_PERFORMANCE2(filter, test_equality, verify32, false);
std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl;
return 0;

View file

@ -73,3 +73,26 @@ 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);
}
TEST(Crypto, verify_32)
{
// all bytes are treated the same, so we can brute force just one byte
unsigned char k0[32] = {0}, k1[32] = {0};
for (unsigned int i0 = 0; i0 < 256; ++i0)
{
k0[0] = i0;
for (unsigned int i1 = 0; i1 < 256; ++i1)
{
k1[0] = i1;
ASSERT_EQ(!crypto_verify_32(k0, k1), i0 == i1);
}
}
}