diff options
| author | Matt Caswell <matt@openssl.org> | 2021-03-15 17:44:42 +0000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-03-17 10:16:21 +1000 |
| commit | 5db682733de0afcfece92ac011c1eb1ca775c32a (patch) | |
| tree | c52ee42bbefeae16e768b66f8166e86cbef27898 /crypto/siphash | |
| parent | 37cddb2e2df4f815a6d3fdb857d1ef8cddef9ce9 (diff) | |
Fix a TODO(3.0) in the siphash code
All 3 files that included crypto/siphash.h also included siphash_local.h,
and no other files included siphash_local.h independently. They probably
should be just one header file.
Fixes #14360
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14558)
Diffstat (limited to 'crypto/siphash')
| -rw-r--r-- | crypto/siphash/siphash.c | 1 | ||||
| -rw-r--r-- | crypto/siphash/siphash_local.h | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/crypto/siphash/siphash.c b/crypto/siphash/siphash.c index 071339d444..7584255709 100644 --- a/crypto/siphash/siphash.c +++ b/crypto/siphash/siphash.c @@ -28,7 +28,6 @@ #include <openssl/crypto.h> #include "crypto/siphash.h" -#include "siphash_local.h" #define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b)))) diff --git a/crypto/siphash/siphash_local.h b/crypto/siphash/siphash_local.h deleted file mode 100644 index 54d65dfc6e..0000000000 --- a/crypto/siphash/siphash_local.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -/* Based on https://131002.net/siphash C reference implementation */ - -struct siphash_st { - uint64_t total_inlen; - uint64_t v0; - uint64_t v1; - uint64_t v2; - uint64_t v3; - unsigned int len; - unsigned int hash_size; - unsigned int crounds; - unsigned int drounds; - unsigned char leavings[SIPHASH_BLOCK_SIZE]; -}; - -/* default: SipHash-2-4 */ -#define SIPHASH_C_ROUNDS 2 -#define SIPHASH_D_ROUNDS 4 - |