frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add secp256k1_ prefix to default callback functions

Browse Source
This commit is contained in:
Tim Ruffing 2019-03-09 11:41:21 +01:00
parent 08e2e19f24
commit 9c1dda828f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/secp256k1.c
View File

@ -46,28 +46,28 @@
#ifndef USE_EXTERNAL_DEFAULT_CALLBACKS #ifndef USE_EXTERNAL_DEFAULT_CALLBACKS
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
static void default_illegal_callback_fn(const char* str, void* data) { static void secp256k1_default_illegal_callback_fn(const char* str, void* data) {
(void)data; (void)data;
fprintf(stderr, "[libsecp256k1] illegal argument: %s\n", str); fprintf(stderr, "[libsecp256k1] illegal argument: %s\n", str);
abort(); abort();
} }
static void default_error_callback_fn(const char* str, void* data) { static void secp256k1_default_error_callback_fn(const char* str, void* data) {
(void)data; (void)data;
fprintf(stderr, "[libsecp256k1] internal consistency check failed: %s\n", str); fprintf(stderr, "[libsecp256k1] internal consistency check failed: %s\n", str);
abort(); abort();
} }
#else #else
void default_illegal_callback_fn(const char* str, void* data); void secp256k1_default_illegal_callback_fn(const char* str, void* data);
void default_error_callback_fn(const char* str, void* data); void secp256k1_default_error_callback_fn(const char* str, void* data);
#endif #endif
static const secp256k1_callback default_illegal_callback = { static const secp256k1_callback default_illegal_callback = {
default_illegal_callback_fn, secp256k1_default_illegal_callback_fn,
NULL NULL
}; };
static const secp256k1_callback default_error_callback = { static const secp256k1_callback default_error_callback = {
default_error_callback_fn, secp256k1_default_error_callback_fn,
NULL NULL
}; };
@ -81,8 +81,8 @@ struct secp256k1_context_struct {
static const secp256k1_context secp256k1_context_no_precomp_ = { static const secp256k1_context secp256k1_context_no_precomp_ = {
{ 0 }, { 0 },
{ 0 }, { 0 },
{ default_illegal_callback_fn, 0 }, { secp256k1_default_illegal_callback_fn, 0 },
{ default_error_callback_fn, 0 } { secp256k1_default_error_callback_fn, 0 }
}; };
const secp256k1_context *secp256k1_context_no_precomp = &secp256k1_context_no_precomp_; const secp256k1_context *secp256k1_context_no_precomp = &secp256k1_context_no_precomp_;
@ -200,7 +200,7 @@ void secp256k1_context_destroy(secp256k1_context* ctx) {
void secp256k1_context_set_illegal_callback(secp256k1_context* ctx, void (*fun)(const char* message, void* data), const void* data) { void secp256k1_context_set_illegal_callback(secp256k1_context* ctx, void (*fun)(const char* message, void* data), const void* data) {
ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp); ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp);
if (fun == NULL) { if (fun == NULL) {
fun = default_illegal_callback_fn; fun = secp256k1_default_illegal_callback_fn;
} }
ctx->illegal_callback.fn = fun; ctx->illegal_callback.fn = fun;
ctx->illegal_callback.data = data; ctx->illegal_callback.data = data;
@ -209,7 +209,7 @@ void secp256k1_context_set_illegal_callback(secp256k1_context* ctx, void (*fun)(
void secp256k1_context_set_error_callback(secp256k1_context* ctx, void (*fun)(const char* message, void* data), const void* data) { void secp256k1_context_set_error_callback(secp256k1_context* ctx, void (*fun)(const char* message, void* data), const void* data) {
ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp); ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp);
if (fun == NULL) { if (fun == NULL) {
fun = default_error_callback_fn; fun = secp256k1_default_error_callback_fn;
} }
ctx->error_callback.fn = fun; ctx->error_callback.fn = fun;
ctx->error_callback.data = data; ctx->error_callback.data = data;