From c3b68c12d60b92d7344f75936c00c928db815f5c Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Mon, 4 Apr 2016 03:18:24 +0000 Subject: [PATCH] Fix up relative includes of sodium/common.h --- .../crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c | 2 +- src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c | 2 +- src/libsodium/crypto_core/salsa20/ref/core_salsa20.c | 2 +- src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c | 2 +- src/libsodium/crypto_core/salsa208/ref/core_salsa208.c | 2 +- .../crypto_generichash/blake2/ref/blake2b-compress-ref.c | 2 +- .../crypto_shorthash/siphash24/ref/shorthash_siphash24.c | 2 +- src/libsodium/crypto_stream/aes128ctr/portable/common.h | 2 +- src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c b/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c index 53510f5a..29d080d2 100644 --- a/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c +++ b/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c @@ -10,7 +10,7 @@ #include "crypto_verify_16.h" #include "utils.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" static const unsigned char _pad0[16] = { 0 }; diff --git a/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c b/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c index 384cc33f..f55d18bd 100644 --- a/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c +++ b/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c @@ -8,7 +8,7 @@ Public domain. #include #include "crypto_core_hsalsa20.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" #define ROUNDS 20 #define U32C(v) (v##U) diff --git a/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c b/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c index d32bd5f9..4c3973c4 100644 --- a/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c +++ b/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c @@ -8,7 +8,7 @@ Public domain. #include #include "crypto_core_salsa20.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" #define ROUNDS 20 #define U32C(v) (v##U) diff --git a/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c b/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c index 147eca1f..9e0dc09b 100644 --- a/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c +++ b/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c @@ -8,7 +8,7 @@ Public domain. #include #include "crypto_core_salsa2012.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" #define ROUNDS 12 #define U32C(v) (v##U) diff --git a/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c b/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c index b1c2eaf8..9db4b5aa 100644 --- a/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c +++ b/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c @@ -8,7 +8,7 @@ Public domain. #include #include "crypto_core_salsa208.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" #define ROUNDS 8 #define U32C(v) (v##U) diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c index b35b5bf9..ae874f29 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c @@ -4,7 +4,7 @@ #include "blake2.h" #include "blake2-impl.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" CRYPTO_ALIGN(64) static const uint64_t blake2b_IV[8] = { diff --git a/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c b/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c index 70ff4c80..72e6cf40 100644 --- a/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c +++ b/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c @@ -1,5 +1,5 @@ #include "crypto_shorthash_siphash24.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" typedef uint64_t u64; typedef uint32_t u32; diff --git a/src/libsodium/crypto_stream/aes128ctr/portable/common.h b/src/libsodium/crypto_stream/aes128ctr/portable/common.h index 2e12c4e2..2eb4412e 100644 --- a/src/libsodium/crypto_stream/aes128ctr/portable/common.h +++ b/src/libsodium/crypto_stream/aes128ctr/portable/common.h @@ -5,7 +5,7 @@ #define COMMON_H #include "types.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" /* Macros required only for key expansion */ diff --git a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c index 15cbae78..66740ed1 100644 --- a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c +++ b/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c @@ -13,7 +13,7 @@ #include "crypto_stream_chacha20.h" #include "stream_chacha20_ref.h" #include "../stream_chacha20.h" -#include "../../sodium/common.h" +#include "../../../sodium/common.h" struct chacha_ctx { uint32_t input[16];