Skip to content

Signature fix and BN fix in the same PR (only used for testing) #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
n-hutton wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Signature fix and BN fix in the same PR (only used for testing) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8d19e7b
cherrry pick fixed files
n-hutton Jul 7, 2022
455fd72
schnorr fix
n-hutton Jul 13, 2022
8266ea0
add debug string
n-hutton Jul 13, 2022
b125d60
fix...
n-hutton Jul 13, 2022
7bc2dd5
tidy away cout
n-hutton Jul 15, 2022
0e6552f
tidying
n-hutton Jul 15, 2022
8a141e6
style
n-hutton Jul 15, 2022
27b7c8d
fix
n-hutton Jul 15, 2022
66b1ae3
style..
n-hutton Jul 15, 2022
125cd4b
do not include reverted files
Aug 11, 2022
8365020
revert bn fix but keep signature
Aug 11, 2022
6262444
split into only bn fix
Aug 11, 2022
994269d
Merge branch 'signature_fix' into sig_fix_plus_bn
Aug 11, 2022
88cecd3
cherry pick
Aug 11, 2022
c54f4ca
Make sure to add sig fix, too
Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libSchnorr/src/MultiSig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ bool MultiSig::MultiSigVerify(const bytes& message, unsigned int offset,
return false;
}
err2 = (BN_nnmod(challenge_built.get(), challenge_built.get(),
Schnorr::GetCurveOrder(), NULL) == 0);
Schnorr::GetCurveOrder(), ctx.get()) == 0);
err = err || err2;
if (err2) {
// Challenge rebuild mod failed
Expand Down
8 changes: 7 additions & 1 deletion src/libSchnorr/src/MultiSig_Challenge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ void Challenge::Set(const CommitPoint& aggregatedCommit,

bytes buf(Schnorr::PUBKEY_COMPRESSED_SIZE_BYTES);

unique_ptr<BN_CTX, void (*)(BN_CTX*)> ctx(BN_CTX_new(), BN_CTX_free);
if (!ctx) {
throw std::bad_alloc();
}

// Convert the committment to octets first
if (EC_POINT_point2oct(Schnorr::GetCurveGroup(), aggregatedCommit.m_p.get(),
POINT_CONVERSION_COMPRESSED, buf.data(),
Expand Down Expand Up @@ -166,7 +171,8 @@ void Challenge::Set(const CommitPoint& aggregatedCommit,
return;
}

if (BN_nnmod(m_c.get(), m_c.get(), Schnorr::GetCurveOrder(), NULL) == 0) {
if (BN_nnmod(m_c.get(), m_c.get(), Schnorr::GetCurveOrder(), ctx.get()) ==
0) {
// Could not reduce challenge modulo group order
return;
}
Expand Down
7 changes: 6 additions & 1 deletion src/libSchnorr/src/MultiSig_CommitPointHash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ void CommitPointHash::Set(const CommitPoint& point) {
// byte to 0x01.
sha2.Update({SECOND_DOMAIN_SEPARATED_HASH_FUNCTION_BYTE});

unique_ptr<BN_CTX, void (*)(BN_CTX*)> ctx(BN_CTX_new(), BN_CTX_free);
if (!ctx) {
throw std::bad_alloc();
}
// Convert the commitment to octets first
if (EC_POINT_point2oct(Schnorr::GetCurveGroup(), point.m_p.get(),
POINT_CONVERSION_COMPRESSED, buf.data(),
Expand All @@ -123,7 +127,8 @@ void CommitPointHash::Set(const CommitPoint& point) {
return;
}

if (BN_nnmod(m_h.get(), m_h.get(), Schnorr::GetCurveOrder(), NULL) == 0) {
if (BN_nnmod(m_h.get(), m_h.get(), Schnorr::GetCurveOrder(), ctx.get()) ==
0) {
// Could not reduce hashpoint value modulo group order
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/libSchnorr/src/Schnorr_PubKey.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ bool PubKey::Serialize(bytes& dst, unsigned int offset) const {

bool PubKey::Deserialize(const bytes& src, unsigned int offset) {
shared_ptr<EC_POINT> result =
ECPOINTSerialize::GetNumber(src, offset, PUB_KEY_SIZE);
ECPOINTSerialize::GetNumber(src, offset, src.size());

if (result == nullptr) {
// ECPOINTSerialize::GetNumber failed
Expand Down