From 81a7abea7e5c2a1bf26481aebfa45a5ef74afc05 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 27 May 2015 15:39:34 +0200 Subject: [PATCH] "buffer" and "buffer size" are way too generic to be useful --- demos/auth.c | 2 +- demos/box.c | 8 ++++---- demos/demo_utils.c | 4 ++-- demos/demo_utils.h | 2 +- demos/generichash.c | 2 +- demos/generichashstream.c | 2 +- demos/hash.c | 2 +- demos/onetimeauth.c | 2 +- demos/shorthash.c | 2 +- demos/sign.c | 12 ++++++------ demos/stream.c | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/demos/auth.c b/demos/auth.c index ef9d1e0e..c25e95c9 100644 --- a/demos/auth.c +++ b/demos/auth.c @@ -20,7 +20,7 @@ auth(void) { unsigned char k[crypto_auth_KEYBYTES]; /* key */ unsigned char a[crypto_auth_BYTES]; /* authentication token */ - unsigned char m[BUFFER_SIZE]; /* message */ + unsigned char m[MAX_INPUT_SIZE]; /* message */ size_t mlen; /* message length */ int r; diff --git a/demos/box.c b/demos/box.c index da69075e..796993e2 100644 --- a/demos/box.c +++ b/demos/box.c @@ -30,10 +30,10 @@ box(void) unsigned char alice_pk[crypto_box_PUBLICKEYBYTES]; /* Alice public */ unsigned char alice_sk[crypto_box_SECRETKEYBYTES]; /* Alice secret */ - unsigned char n[crypto_box_NONCEBYTES]; /* message nonce */ - unsigned char m[BUFFER_SIZE]; /* plaintext */ - unsigned char c[BUFFER_SIZE + crypto_box_MACBYTES]; /* ciphertext */ - size_t mlen; /* length */ + unsigned char n[crypto_box_NONCEBYTES]; /* message nonce */ + unsigned char m[MAX_INPUT_SIZE]; /* plaintext */ + unsigned char c[MAX_INPUT_SIZE + crypto_box_MACBYTES]; /* ciphertext */ + size_t mlen; /* length */ int r; puts("Example: crypto_box_easy\n"); diff --git a/demos/demo_utils.c b/demos/demo_utils.c index 689928a8..e56abba0 100644 --- a/demos/demo_utils.c +++ b/demos/demo_utils.c @@ -15,7 +15,7 @@ * ================================================================== */ /* - * Print hex is a wrapper around sodium_bin2hex which allocates + * print_hex() is a wrapper around sodium_bin2hex() which allocates * temporary memory then immediately prints the result. */ void @@ -64,7 +64,7 @@ prompt_input(char *prompt, char *input, const size_t max_input_len) } /* - * Print a message if the function was sucessful or failed. + * Display whether the function was sucessful or failed. */ void print_verification(int r) diff --git a/demos/demo_utils.h b/demos/demo_utils.h index 29d3aa0a..619bb1fa 100644 --- a/demos/demo_utils.h +++ b/demos/demo_utils.h @@ -6,7 +6,7 @@ #include -#define BUFFER_SIZE 128 /* size of all input buffers in the demo */ +#define MAX_INPUT_SIZE 128 /* size of all input buffers in the demo */ void print_hex(const void *bin, const size_t bin_len); size_t prompt_input(char *prompt, char *input, const size_t max_input_len); diff --git a/demos/generichash.c b/demos/generichash.c index 71342c69..05527cf3 100644 --- a/demos/generichash.c +++ b/demos/generichash.c @@ -23,7 +23,7 @@ generichash(void) { unsigned char k[crypto_generichash_KEYBYTES_MAX]; /* key */ unsigned char h[crypto_generichash_BYTES_MIN]; /* hash output */ - unsigned char m[BUFFER_SIZE]; /* message */ + unsigned char m[MAX_INPUT_SIZE]; /* message */ size_t mlen; /* length */ puts("Example: crypto_generichash\n"); diff --git a/demos/generichashstream.c b/demos/generichashstream.c index 48445997..3da5d1bd 100644 --- a/demos/generichashstream.c +++ b/demos/generichashstream.c @@ -21,7 +21,7 @@ generichashstream(void) unsigned char k[crypto_generichash_KEYBYTES_MAX]; /* key */ unsigned char h[crypto_generichash_BYTES_MIN]; /* hash output */ crypto_generichash_state state; /* hash stream */ - unsigned char m[BUFFER_SIZE]; /* input buffer */ + unsigned char m[MAX_INPUT_SIZE]; /* input buffer */ size_t mlen; /* input length */ puts("Example: crypto_generichashstream\n"); diff --git a/demos/hash.c b/demos/hash.c index 1765413d..dbdcb278 100644 --- a/demos/hash.c +++ b/demos/hash.c @@ -18,7 +18,7 @@ static void hash(void) { unsigned char h[crypto_hash_BYTES]; /* hash output */ - unsigned char m[BUFFER_SIZE]; /* message */ + unsigned char m[MAX_INPUT_SIZE]; /* message */ size_t mlen; /* length */ puts("Example: crypto_hash\n"); diff --git a/demos/onetimeauth.c b/demos/onetimeauth.c index fdbcfbb5..7a6dd9d6 100644 --- a/demos/onetimeauth.c +++ b/demos/onetimeauth.c @@ -22,7 +22,7 @@ onetimeauth(void) { unsigned char k[crypto_onetimeauth_KEYBYTES]; /* key */ unsigned char a[crypto_onetimeauth_BYTES]; /* authentication */ - unsigned char m[BUFFER_SIZE]; /* message */ + unsigned char m[MAX_INPUT_SIZE]; /* message */ size_t mlen; /* message length */ int r; diff --git a/demos/shorthash.c b/demos/shorthash.c index a1ee3141..26326ad3 100644 --- a/demos/shorthash.c +++ b/demos/shorthash.c @@ -20,7 +20,7 @@ shorthash(void) { unsigned char k[crypto_shorthash_KEYBYTES]; /* key */ unsigned char h[crypto_shorthash_BYTES]; /* hash output */ - unsigned char m[BUFFER_SIZE]; /* message */ + unsigned char m[MAX_INPUT_SIZE]; /* message */ size_t mlen; /* length */ puts("Example: crypto_shorthash\n"); diff --git a/demos/sign.c b/demos/sign.c index 6e7acb89..13d66995 100644 --- a/demos/sign.c +++ b/demos/sign.c @@ -22,12 +22,12 @@ static int sign(void) { - unsigned char pk[crypto_sign_PUBLICKEYBYTES]; /* Bob public */ - unsigned char sk[crypto_sign_SECRETKEYBYTES]; /* Bob secret */ - unsigned char m[BUFFER_SIZE]; /* message */ - unsigned char sm[BUFFER_SIZE + crypto_sign_BYTES]; /* signed message */ - unsigned long long int mlen; /* message length */ - unsigned long long int smlen; /* signed length */ + unsigned char pk[crypto_sign_PUBLICKEYBYTES]; /* Bob public */ + unsigned char sk[crypto_sign_SECRETKEYBYTES]; /* Bob secret */ + unsigned char m[MAX_INPUT_SIZE]; /* message */ + unsigned char sm[MAX_INPUT_SIZE + crypto_sign_BYTES]; /* signed message */ + unsigned long long int mlen; /* message length */ + unsigned long long int smlen; /* signed length */ int r; puts("Example: crypto_sign\n"); diff --git a/demos/stream.c b/demos/stream.c index f5a89434..fa697e55 100644 --- a/demos/stream.c +++ b/demos/stream.c @@ -25,8 +25,8 @@ stream(void) { unsigned char k[crypto_stream_KEYBYTES]; /* secret key */ unsigned char n[crypto_stream_NONCEBYTES]; /* message nonce */ - unsigned char m[BUFFER_SIZE]; /* plain-text */ - unsigned char c[BUFFER_SIZE]; /* cipher-text */ + unsigned char m[MAX_INPUT_SIZE]; /* plain-text */ + unsigned char c[MAX_INPUT_SIZE]; /* cipher-text */ size_t mlen; /* length */ int r;