diff --git a/demos/auth.c b/demos/auth.c index eed4fde9..fabc58f4 100644 --- a/demos/auth.c +++ b/demos/auth.c @@ -63,8 +63,7 @@ auth(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); + init(); return auth() != 0; } diff --git a/demos/box.c b/demos/box.c index e69460b6..a2629140 100644 --- a/demos/box.c +++ b/demos/box.c @@ -114,8 +114,7 @@ box(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); + init(); return box() != 0; } diff --git a/demos/generichash.c b/demos/generichash.c index 6c0508f5..ecb26d17 100644 --- a/demos/generichash.c +++ b/demos/generichash.c @@ -45,9 +45,8 @@ generichash(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); - + init(); generichash(); + return 0; } diff --git a/demos/generichashstream.c b/demos/generichashstream.c index 08d840ce..6f8e2119 100644 --- a/demos/generichashstream.c +++ b/demos/generichashstream.c @@ -55,9 +55,8 @@ generichashstream(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); - + init(); generichashstream(); + return 0; } diff --git a/demos/onetimeauth.c b/demos/onetimeauth.c index 7e8f193a..e344dc64 100644 --- a/demos/onetimeauth.c +++ b/demos/onetimeauth.c @@ -65,8 +65,7 @@ onetimeauth(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); + init(); return onetimeauth() != 0; } diff --git a/demos/shorthash.c b/demos/shorthash.c index a0317edc..d567b6c8 100644 --- a/demos/shorthash.c +++ b/demos/shorthash.c @@ -42,9 +42,8 @@ shorthash(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); - + init(); shorthash(); + return 0; } diff --git a/demos/sign.c b/demos/sign.c index a7132790..6107c642 100644 --- a/demos/sign.c +++ b/demos/sign.c @@ -83,8 +83,7 @@ sign(void) int main(void) { - sodium_init(); - printf("Using LibSodium %s\n", sodium_version_string()); + init(); return sign() != 0; } diff --git a/demos/utils.c b/demos/utils.c index 1a1fe429..a24b68e4 100644 --- a/demos/utils.c +++ b/demos/utils.c @@ -74,3 +74,10 @@ print_verification(int r) else puts("Failure\n"); } + +void +init(void) +{ + sodium_init(); + printf("Using libsodium %s\n", sodium_version_string()); +} diff --git a/demos/utils.h b/demos/utils.h index bd915cdd..d6890d16 100644 --- a/demos/utils.h +++ b/demos/utils.h @@ -1,15 +1,19 @@ /* * Utility functions shared by all the demo programs. */ -#ifndef DEMO_UTILS_H -#define DEMO_UTILS_H +#ifndef UTILS_H +#define UTILS_H #include #define MAX_INPUT_SIZE 4096 /* max 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); + void print_verification(int r); -#endif /* DEMO_UTILS_H */ +void init(void); + +#endif /* UTILS_H */