Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

experimental crypto: many improvements to scalar_t, point_t (mul_plus_G), hash_calculator

Browse source
This commit is contained in:
sowle 2021-02-12 23:45:50 +03:00
parent 140a300421
commit b18be24334
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 78 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
tests/functional_tests/crypto_tests.cpp
View file

@ -15,8 +15,6 @@ extern "C" {
#include "crypto/crypto-ops.h"
} // extern "C"
unsigned char Lm2[32] = { 0xeb, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10 };
// out = z ^ s (mod l)
void sc_exp(unsigned char* out, const unsigned char* z, const unsigned char* s)
{
@ -425,6 +423,11 @@ struct point_t
{
}
explicit point_t(const crypto::public_key& pk)
{
from_public_key(pk); // TODO: what if it fails?
}
void zero()
{
ge_p3_0(&m_p3);
@ -441,6 +444,11 @@ struct point_t
return ge_frombytes_vartime(&m_p3, reinterpret_cast<const unsigned char*>(&pk)) == 0;
}
bool from_key_image(const crypto::key_image& ki)
{
return ge_frombytes_vartime(&m_p3, reinterpret_cast<const unsigned char*>(&ki)) == 0;
}
crypto::public_key to_public_key() const
{
crypto::public_key result;
@ -448,6 +456,13 @@ struct point_t
return result;
}
crypto::key_image to_key_image() const
{
crypto::key_image result;
ge_p3_tobytes((unsigned char*)&result, &m_p3);
return result;
}
point_t operator+(const point_t& rhs) const
{
point_t result;
@ -486,6 +501,20 @@ struct point_t
return result;
}
// returns a * this + G
point_t mul_plus_G(const scalar_t& a) const
{
static const unsigned char one[32] = { 1 };
static_assert(sizeof one == sizeof(crypto::ec_scalar), "size missmatch");
point_t result;
ge_p2 p2;
ge_double_scalarmult_base_vartime(&p2, &a.m_s[0], &m_p3, &one[0]);
ge_p2_to_p3(&result.m_p3, &p2);
return result;
}
friend bool operator==(const point_t& lhs, const point_t& rhs)
{
// convert to xy form, then compare components (because (z, y, z, t) representation is not unique)
@ -603,12 +632,38 @@ struct hash_helper_t
void add_point(const point_t& point)
{
m_elements.emplace_back(point.to_public_key());
// faster?
/* static_assert(sizeof point.m_p3 == 5 * sizeof(item_t), "size missmatch");
const item_t *p = (item_t*)&point.m_p3;
m_elements.emplace_back(p[0]);
m_elements.emplace_back(p[1]);
m_elements.emplace_back(p[2]);
m_elements.emplace_back(p[3]);
m_elements.emplace_back(p[4]); */
}
void add_pub_key(const crypto::public_key& pk)
{
m_elements.emplace_back(pk);
}
void add_points_array(const std::vector<point_t>& points_array)
{
for (size_t i = 0, size = points_array.size(); i < size; ++i)
m_elements.emplace_back(points_array[i].to_public_key());
add_point(points_array[i]);
}
void add_pub_keys_array(const std::vector<crypto::public_key>& pub_keys_array)
{
for (size_t i = 0, size = pub_keys_array.size(); i < size; ++i)
m_elements.emplace_back(pub_keys_array[i]);
}
void add_key_images_array(const std::vector<crypto::key_image>& key_image_array)
{
for (size_t i = 0, size = key_image_array.size(); i < size; ++i)
m_elements.emplace_back(key_image_array[i]);
}
scalar_t calc_hash(bool clear = true)
@ -623,10 +678,12 @@ struct hash_helper_t
union item_t
{
item_t(const crypto::public_key& pk) : pk(pk) {}
item_t(const scalar_t& scalar) : scalar(scalar) {}
item_t(const crypto::public_key& pk) : pk(pk) {}
item_t(const crypto::key_image& ki) : ki(ki) {}
scalar_t scalar;
crypto::public_key pk;
crypto::key_image ki;
};
std::vector<item_t> m_elements;
@ -647,6 +704,16 @@ struct hash_helper_t
return hs_calculator.calc_hash();
}
static scalar_t hs(const crypto::hash& s, const std::vector<crypto::public_key>& ps0, const std::vector<crypto::key_image>& ps1)
{
static_assert(sizeof(crypto::hash) == sizeof(scalar_t), "size missmatch");
hs_t hs_calculator;
hs_calculator.add_scalar(*reinterpret_cast<const scalar_t*>(&s));
hs_calculator.add_pub_keys_array(ps0);
hs_calculator.add_key_images_array(ps1);
return hs_calculator.calc_hash();
}
static scalar_t hs(const std::vector<point_t>& ps0, const std::vector<point_t>& ps1)
{
hs_t hs_calculator;
@ -664,6 +731,13 @@ struct hash_helper_t
return result;
}
static point_t hp(const crypto::public_key& p)
{
point_t result;
ge_bytes_hash_to_ec(&result.m_p3, (const unsigned char*)&p);
return result;
}
};
//