kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: use malloc instead of alloca

Browse source
This commit is contained in:
moneromooo-monero 2017-08-20 21:19:29 +01:00
parent 80794b3114
commit b5345ef4f0
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/crypto/crypto.cpp
View file

@ -36,18 +36,13 @@
#include <memory> #include <memory>
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include <boost/thread/lock_guard.hpp> #include <boost/thread/lock_guard.hpp>
#include <boost/shared_ptr.hpp>
#include "common/varint.h" #include "common/varint.h"
#include "warnings.h" #include "warnings.h"
#include "crypto.h" #include "crypto.h"
#include "hash.h" #include "hash.h"
#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
#include <alloca.h>
#else
#include <stdlib.h>
#endif
namespace crypto { namespace crypto {
using std::abort; using std::abort;
@ -411,7 +406,9 @@ POP_WARNINGS
ge_p3 image_unp; ge_p3 image_unp;
ge_dsmp image_pre; ge_dsmp image_pre;
ec_scalar sum, k, h; ec_scalar sum, k, h;
rs_comm *const buf = reinterpret_cast<rs_comm *>(alloca(rs_comm_size(pubs_count))); boost::shared_ptr<rs_comm> buf(reinterpret_cast<rs_comm *>(malloc(rs_comm_size(pubs_count))), free);
if (!buf)
abort();
assert(sec_index < pubs_count); assert(sec_index < pubs_count);
#if !defined(NDEBUG) #if !defined(NDEBUG)
{ {
@ -459,7 +456,7 @@ POP_WARNINGS
sc_add(&sum, &sum, &sig[i].c); sc_add(&sum, &sum, &sig[i].c);
} }
} }
hash_to_scalar(buf, rs_comm_size(pubs_count), h); hash_to_scalar(buf.get(), rs_comm_size(pubs_count), h);
sc_sub(&sig[sec_index].c, &h, &sum); sc_sub(&sig[sec_index].c, &h, &sum);
sc_mulsub(&sig[sec_index].r, &sig[sec_index].c, &sec, &k); sc_mulsub(&sig[sec_index].r, &sig[sec_index].c, &sec, &k);
} }
@ -471,7 +468,9 @@ POP_WARNINGS
ge_p3 image_unp; ge_p3 image_unp;
ge_dsmp image_pre; ge_dsmp image_pre;
ec_scalar sum, h; ec_scalar sum, h;
rs_comm *const buf = reinterpret_cast<rs_comm *>(alloca(rs_comm_size(pubs_count))); boost::shared_ptr<rs_comm> buf(reinterpret_cast<rs_comm *>(malloc(rs_comm_size(pubs_count))), free);
if (!buf)
return false;
#if !defined(NDEBUG) #if !defined(NDEBUG)
for (i = 0; i < pubs_count; i++) { for (i = 0; i < pubs_count; i++) {
assert(check_key(*pubs[i])); assert(check_key(*pubs[i]));
@ -499,7 +498,7 @@ POP_WARNINGS
ge_tobytes(&buf->ab[i].b, &tmp2); ge_tobytes(&buf->ab[i].b, &tmp2);
sc_add(&sum, &sum, &sig[i].c); sc_add(&sum, &sum, &sig[i].c);
} }
hash_to_scalar(buf, rs_comm_size(pubs_count), h); hash_to_scalar(buf.get(), rs_comm_size(pubs_count), h);
sc_sub(&h, &h, &sum); sc_sub(&h, &h, &sum);
return sc_isnonzero(&h) == 0; return sc_isnonzero(&h) == 0;
} }