Skip to content
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

Adding message length to the callbacks #639

Closed
wants to merge 3 commits into from
Closed

Adding message length to the callbacks #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
916f4d6
Added a message len to the callbacks in the headers
elichai Jun 13, 2019
fd23b2f
Added a message len to the callbacks implementation
elichai Jun 13, 2019
abe9d5a
Updated the tests with the new callbacks function signature (msg len)
elichai Jun 13, 2019
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
4 changes: 2 additions & 2 deletions include/secp256k1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ SECP256K1_API void secp256k1_context_destroy(
*/
SECP256K1_API void secp256k1_context_set_illegal_callback(
secp256k1_context* ctx,
void (*fun)(const char* message, void* data),
void (*fun)(const char* message, size_t message_len, void* data),
const void* data
) SECP256K1_ARG_NONNULL(1);

Expand All @@ -297,7 +297,7 @@ SECP256K1_API void secp256k1_context_set_illegal_callback(
*/
SECP256K1_API void secp256k1_context_set_error_callback(
secp256k1_context* ctx,
void (*fun)(const char* message, void* data),
void (*fun)(const char* message, size_t message_len, void* data),
const void* data
) SECP256K1_ARG_NONNULL(1);

Expand Down
14 changes: 8 additions & 6 deletions src/secp256k1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,21 @@
#ifndef USE_EXTERNAL_DEFAULT_CALLBACKS
#include <stdlib.h>
#include <stdio.h>
static void secp256k1_default_illegal_callback_fn(const char* str, void* data) {
static void secp256k1_default_illegal_callback_fn(const char* str, size_t str_len, void* data) {
VERIFY_CHECK(strlen(str) == str_len);
(void)data;
fprintf(stderr, "[libsecp256k1] illegal argument: %s\n", str);
abort();
}
static void secp256k1_default_error_callback_fn(const char* str, void* data) {
static void secp256k1_default_error_callback_fn(const char* str, size_t str_len, void* data) {
VERIFY_CHECK(strlen(str) == str_len);
(void)data;
fprintf(stderr, "[libsecp256k1] internal consistency check failed: %s\n", str);
abort();
}
#else
void secp256k1_default_illegal_callback_fn(const char* str, void* data);
void secp256k1_default_error_callback_fn(const char* str, void* data);
void secp256k1_default_illegal_callback_fn(const char* str, size_t str_len, void* data);
void secp256k1_default_error_callback_fn(const char* str, size_t str_len, void* data);
#endif

static const secp256k1_callback default_illegal_callback = {
Expand Down Expand Up @@ -187,7 +189,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, size_t message_len, void* data), const void* data) {
ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp);
if (fun == NULL) {
fun = secp256k1_default_illegal_callback_fn;
Expand All @@ -196,7 +198,7 @@ void secp256k1_context_set_illegal_callback(secp256k1_context* ctx, void (*fun)(
ctx->illegal_callback.data = data;
}

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, size_t message_len, void* data), const void* data) {
ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp);
if (fun == NULL) {
fun = secp256k1_default_error_callback_fn;
Expand Down
6 changes: 4 additions & 2 deletions src/tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,20 @@ void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
static int count = 64;
static secp256k1_context *ctx = NULL;

static void counting_illegal_callback_fn(const char* str, void* data) {
static void counting_illegal_callback_fn(const char* str, size_t str_len, void* data) {
/* Dummy callback function that just counts. */
int32_t *p;
(void)str;
(void)str_len;
p = data;
(*p)++;
}

static void uncounting_illegal_callback_fn(const char* str, void* data) {
static void uncounting_illegal_callback_fn(const char* str, size_t str_len, void* data) {
/* Dummy callback function that just counts (backwards). */
int32_t *p;
(void)str;
(void)str_len;
p = data;
(*p)--;
}
Expand Down
5 changes: 3 additions & 2 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>

typedef struct {
void (*fn)(const char *text, void* data);
void (*fn)(const char *text, size_t text_len, void* data);
const void* data;
} secp256k1_callback;

static SECP256K1_INLINE void secp256k1_callback_call(const secp256k1_callback * const cb, const char * const text) {
cb->fn(text, (void*)cb->data);
cb->fn(text, strlen(text), (void*)cb->data);
}

#ifdef DETERMINISTIC
Expand Down