diff --git a/iguana/iguana_secp.c b/iguana/iguana_secp.c index b984c236d..d133e7248 100755 --- a/iguana/iguana_secp.c +++ b/iguana/iguana_secp.c @@ -347,10 +347,10 @@ uint64_t bitcoin_rangeverify(void *ctx,int32_t *exponentp,int32_t *mantissap,uin int32_t bitcoin_rangeproof(void *ctx,uint8_t *proof,uint8_t *commit,bits256 blind,bits256 nonce,uint64_t value,uint64_t min_value,int32_t exponent,int32_t min_bits) { - int32_t prooflen=0 ,retval = -1; uint8_t message[4096]; + int32_t prooflen=0 ,retval = -1; SECP_ENSURE_CTX { - if ( secp256k1_rangeproof_sign(ctx,proof,&prooflen,min_value,commit,blind.bytes,nonce.bytes,exponent,min_bits,value,message) > 0 ) + if ( secp256k1_rangeproof_sign(ctx,proof,&prooflen,min_value,commit,blind.bytes,nonce.bytes,exponent,min_bits,value) > 0 ) retval = prooflen; ENDSECP_ENSURE_CTX } diff --git a/iguana/secp256k1/include/secp256k1_rangeproof.h b/iguana/secp256k1/include/secp256k1_rangeproof.h index 9d6f2dd11..a22be8491 100644 --- a/iguana/secp256k1/include/secp256k1_rangeproof.h +++ b/iguana/secp256k1/include/secp256k1_rangeproof.h @@ -155,7 +155,7 @@ SECP256K1_WARN_UNUSED_RESULT int secp256k1_rangeproof_sign( const unsigned char *nonce, int exp, int min_bits, - uint64_t value,unsigned char message[4096] + uint64_t value ) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(5) SECP256K1_ARG_NONNULL(6) SECP256K1_ARG_NONNULL(7); /** Extract some basic information from a range-proof. diff --git a/iguana/secp256k1/src/bench_rangeproof.c b/iguana/secp256k1/src/bench_rangeproof.c index 9506e0dfe..6885c0f22 100644 --- a/iguana/secp256k1/src/bench_rangeproof.c +++ b/iguana/secp256k1/src/bench_rangeproof.c @@ -45,7 +45,7 @@ static void bench_rangeproof_setup(void* arg) if ( i < sizeof(data->prooflen) ) data->message[i] = i; } - CHECK(secp256k1_rangeproof_sign(data->ctx, data->proof, &data->prooflen,0, data->commit, data->blind, data->nonce, PUBLICDIGITS, data->min_bits, data->v,data->message)); + CHECK(secp256k1_rangeproof_sign(data->ctx, data->proof, &data->prooflen,0, data->commit, data->blind, data->nonce, PUBLICDIGITS, data->min_bits, data->v)); //for (i=0; iprooflen; i++) // printf("%02x",data->proof[i]); CHECK(secp256k1_rangeproof_verify(data->ctx, &minv, &maxv, data->commit, data->proof, data->prooflen)); diff --git a/iguana/secp256k1/src/modules/rangeproof/main_impl.h b/iguana/secp256k1/src/modules/rangeproof/main_impl.h index 4d774e96d..87de981ab 100644 --- a/iguana/secp256k1/src/modules/rangeproof/main_impl.h +++ b/iguana/secp256k1/src/modules/rangeproof/main_impl.h @@ -155,7 +155,7 @@ int secp256k1_rangeproof_verify(const secp256k1_context* ctx, uint64_t *min_valu return secp256k1_rangeproof_verify_impl(&ctx->ecmult_ctx, NULL, &ctx->pedersen_ctx, &ctx->rangeproof_ctx,NULL, NULL, NULL, NULL, NULL, min_value, max_value, commit, proof, plen); } -int secp256k1_rangeproof_sign(const secp256k1_context *ctx, unsigned char *proof, int *plen,uint64_t min_value,const unsigned char *commit, const unsigned char *blind, const unsigned char *nonce,int exp,int min_bits, uint64_t value,unsigned char message[4096]) +int secp256k1_rangeproof_sign(const secp256k1_context *ctx, unsigned char *proof, int *plen,uint64_t min_value,const unsigned char *commit, const unsigned char *blind, const unsigned char *nonce,int exp,int min_bits, uint64_t value) { ARG_CHECK(ctx != NULL); ARG_CHECK(proof != NULL); @@ -167,7 +167,7 @@ int secp256k1_rangeproof_sign(const secp256k1_context *ctx, unsigned char *proof ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)); ARG_CHECK(secp256k1_pedersen_context_is_built(&ctx->pedersen_ctx)); ARG_CHECK(secp256k1_rangeproof_context_is_built(&ctx->rangeproof_ctx)); - return secp256k1_rangeproof_sign_impl(&ctx->ecmult_ctx, &ctx->ecmult_gen_ctx, &ctx->pedersen_ctx, &ctx->rangeproof_ctx,proof, plen, min_value, commit, blind, nonce, exp, min_bits, value,message); + return secp256k1_rangeproof_sign_impl(&ctx->ecmult_ctx, &ctx->ecmult_gen_ctx, &ctx->pedersen_ctx, &ctx->rangeproof_ctx,proof, plen, min_value, commit, blind, nonce, exp, min_bits, value); } #endif diff --git a/iguana/secp256k1/src/modules/rangeproof/rangeproof_impl.h b/iguana/secp256k1/src/modules/rangeproof/rangeproof_impl.h index 3e3f3b579..22b245cf2 100644 --- a/iguana/secp256k1/src/modules/rangeproof/rangeproof_impl.h +++ b/iguana/secp256k1/src/modules/rangeproof/rangeproof_impl.h @@ -258,7 +258,7 @@ SECP256K1_INLINE static int secp256k1_range_proveparams(uint64_t *v,int *rings,i SECP256K1_INLINE static int secp256k1_rangeproof_sign_impl(const secp256k1_ecmult_context *ecmult_ctx, const secp256k1_ecmult_gen_context *ecmult_gen_ctx,const secp256k1_pedersen_context *pedersen_ctx, const secp256k1_rangeproof_context *rangeproof_ctx,unsigned char *proof,int *plen,uint64_t min_value, - const unsigned char *commit,const unsigned char *blind,const unsigned char *nonce,int exp,int min_bits,uint64_t value,unsigned char message[4096]) + const unsigned char *commit,const unsigned char *blind,const unsigned char *nonce,int exp,int min_bits,uint64_t value) { secp256k1_gej pubs[128]; /* Candidate digits for our proof, most inferred. */ secp256k1_scalar s[128]; /* Signatures in our proof, most forged. */ @@ -266,7 +266,6 @@ SECP256K1_INLINE static int secp256k1_rangeproof_sign_impl(const secp256k1_ecmul secp256k1_scalar k[32]; /* Nonces for our non-forged signatures. */ secp256k1_scalar stmp; secp256k1_sha256_t sha256_m; - ; unsigned char tmp[33],prep[4096]; unsigned char *signs; /* Location of sign flags in the proof. */ uint64_t v;