This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 0c11411f35e77c42490a3b422a9f0866693b2b57 Author: Micah Elizabeth Scott beth@torproject.org AuthorDate: Wed Mar 15 14:55:17 2023 -0700
hashx: trim trailing whitespace
Signed-off-by: Micah Elizabeth Scott beth@torproject.org --- src/ext/equix/hashx/CMakeLists.txt | 2 +- src/ext/equix/hashx/include/hashx.h | 4 ++-- src/ext/equix/hashx/src/blake2.c | 2 +- src/ext/equix/hashx/src/hashx.c | 2 +- src/ext/equix/hashx/src/tests.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ext/equix/hashx/CMakeLists.txt b/src/ext/equix/hashx/CMakeLists.txt index 5eb694d5dd..742a5a8523 100644 --- a/src/ext/equix/hashx/CMakeLists.txt +++ b/src/ext/equix/hashx/CMakeLists.txt @@ -11,7 +11,7 @@ set(HASHX_VERSION_STR "${HASHX_VERSION}.${HASHX_VERSION_MINOR}.${HASHX_VERSION_P project(hashx)
set(hashx_sources -src/blake2.c +src/blake2.c src/compiler.c src/compiler_a64.c src/compiler_x86.c diff --git a/src/ext/equix/hashx/include/hashx.h b/src/ext/equix/hashx/include/hashx.h index c95fd295ef..0d5521177a 100644 --- a/src/ext/equix/hashx/include/hashx.h +++ b/src/ext/equix/hashx/include/hashx.h @@ -99,7 +99,7 @@ extern "C" { * * @param type is the type of instance to be created. * - * @return pointer to a new HashX instance. Returns NULL on memory allocation + * @return pointer to a new HashX instance. Returns NULL on memory allocation * failure and HASHX_NOTSUPP if the requested type is not supported. */ HASHX_API hashx_ctx* hashx_alloc(hashx_type type); @@ -111,7 +111,7 @@ HASHX_API hashx_ctx* hashx_alloc(hashx_type type); * @param seed is a pointer to the seed value. * @param size is the size of the seed. * - * @return 1 on success, 0 on failure. + * @return 1 on success, 0 on failure. */ HASHX_API int hashx_make(hashx_ctx* ctx, const void* seed, size_t size);
diff --git a/src/ext/equix/hashx/src/blake2.c b/src/ext/equix/hashx/src/blake2.c index 84b012c79a..916dd9b6ba 100644 --- a/src/ext/equix/hashx/src/blake2.c +++ b/src/ext/equix/hashx/src/blake2.c @@ -430,7 +430,7 @@ int hashx_blake2b_final(blake2b_state* S, void* out, size_t outlen) { }
/* 4-round version of Blake2b */ -void hashx_blake2b_4r(const blake2b_param* params, const void* in, +void hashx_blake2b_4r(const blake2b_param* params, const void* in, size_t inlen, void* out) {
blake2b_state state; diff --git a/src/ext/equix/hashx/src/hashx.c b/src/ext/equix/hashx/src/hashx.c index 5f17ccd522..da84aa51f3 100644 --- a/src/ext/equix/hashx/src/hashx.c +++ b/src/ext/equix/hashx/src/hashx.c @@ -22,7 +22,7 @@ #define HASHX_INPUT_ARGS input, size #endif
-static int initialize_program(hashx_ctx* ctx, hashx_program* program, +static int initialize_program(hashx_ctx* ctx, hashx_program* program, siphash_state keys[2]) {
if (!hashx_program_generate(&keys[0], program)) { diff --git a/src/ext/equix/hashx/src/tests.c b/src/ext/equix/hashx/src/tests.c index 75bd9f0d52..e1569844ac 100644 --- a/src/ext/equix/hashx/src/tests.c +++ b/src/ext/equix/hashx/src/tests.c @@ -215,7 +215,7 @@ int main() { RUN_TEST(test_hash_block1); RUN_TEST(test_compiler_block1); RUN_TEST(test_free); - + printf("\nAll tests were successful\n"); return 0; }