aboutsummaryrefslogtreecommitdiff
path: root/src/crypto/crypto-ops.h
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-12-08 23:30:51 +0200
committerRiccardo Spagni <ric@spagni.net>2017-12-08 23:30:51 +0200
commit782a84f7b490baa10afef94dd6954d6ab50d020b (patch)
tree099cf5e07386236924d312606a2e4569658a1fb8 /src/crypto/crypto-ops.h
parentMerge pull request #2845 (diff)
parentadd bulletproofs from v7 on testnet (diff)
downloadmonero-782a84f7b490baa10afef94dd6954d6ab50d020b.tar.xz
Merge pull request #2883
c83d0b3e add bulletproofs from v7 on testnet (moneromooo-monero) 8620ef0a bulletproofs: switch H/G in Pedersen commitments to match rct (moneromooo-monero) d58835b2 integrate bulletproofs into monero (moneromooo-monero) 90b8d9f2 add bulletproofs to the build, with basic unit tests (moneromooo-monero) fe120264 perf_timer: add non scoped start/stop timer defines (moneromooo-monero) ada42914 add a version of ge_double_scalarmult_precomp_vartime with A precomp (moneromooo-monero) d43eef6d ringct: add a version of addKeys which returns the result (moneromooo-monero) 7ff07928 sc_mul and sc_muladd (luigi1111) 3d0b54bd epee: add do while(0) around brace statement in a macro (moneromooo-monero)
Diffstat (limited to 'src/crypto/crypto-ops.h')
-rw-r--r--src/crypto/crypto-ops.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/crypto/crypto-ops.h b/src/crypto/crypto-ops.h
index 37edf5b6d..c76455551 100644
--- a/src/crypto/crypto-ops.h
+++ b/src/crypto/crypto-ops.h
@@ -128,6 +128,7 @@ void sc_reduce(unsigned char *);
void ge_scalarmult(ge_p2 *, const unsigned char *, const ge_p3 *);
void ge_double_scalarmult_precomp_vartime(ge_p2 *, const unsigned char *, const ge_p3 *, const unsigned char *, const ge_dsmp);
+void ge_double_scalarmult_precomp_vartime2(ge_p2 *, const unsigned char *, const ge_dsmp, const unsigned char *, const ge_dsmp);
void ge_mul8(ge_p1p1 *, const ge_p2 *);
extern const fe fe_ma2;
extern const fe fe_ma;
@@ -141,6 +142,8 @@ void sc_reduce32(unsigned char *);
void sc_add(unsigned char *, const unsigned char *, const unsigned char *);
void sc_sub(unsigned char *, const unsigned char *, const unsigned char *);
void sc_mulsub(unsigned char *, const unsigned char *, const unsigned char *, const unsigned char *);
+void sc_mul(unsigned char *, const unsigned char *, const unsigned char *);
+void sc_muladd(unsigned char *s, const unsigned char *a, const unsigned char *b, const unsigned char *c);
int sc_check(const unsigned char *);
int sc_isnonzero(const unsigned char *); /* Doesn't normalize */