From 60c2c11de820687887a643344fc1b0a91fd45226 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 25 Nov 2013 21:30:36 +0100 Subject: Move cipher and mac structures to a new header --- src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c | 2 +- src/crypto/cipher/blowfish_ctr/builtin/blowfish_ctr.c | 2 +- src/crypto/cipher/ciphers.c.in | 2 +- src/crypto/cipher/null/memcpy/null_memcpy.c | 2 +- src/crypto/cipher/salsa20/nacl/salsa20_nacl.c | 2 +- src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c | 2 +- src/crypto/mac/ghash/builtin/ghash_builtin.c | 2 +- src/crypto/mac/macs.c.in | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/crypto') diff --git a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c index 7c75b7d..a520732 100644 --- a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c +++ b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c @@ -24,7 +24,7 @@ */ -#include "../../../../fastd.h" +#include "../../../../crypto.h" #include diff --git a/src/crypto/cipher/blowfish_ctr/builtin/blowfish_ctr.c b/src/crypto/cipher/blowfish_ctr/builtin/blowfish_ctr.c index d657694..0ca8d2d 100644 --- a/src/crypto/cipher/blowfish_ctr/builtin/blowfish_ctr.c +++ b/src/crypto/cipher/blowfish_ctr/builtin/blowfish_ctr.c @@ -24,7 +24,7 @@ */ -#include "../../../../fastd.h" +#include "../../../../crypto.h" static const uint32_t Sdefault[4][256] = { { diff --git a/src/crypto/cipher/ciphers.c.in b/src/crypto/cipher/ciphers.c.in index 667cfac..c912e60 100644 --- a/src/crypto/cipher/ciphers.c.in +++ b/src/crypto/cipher/ciphers.c.in @@ -24,8 +24,8 @@ */ -#include #include +#include @CIPHER_DEFINITIONS@ diff --git a/src/crypto/cipher/null/memcpy/null_memcpy.c b/src/crypto/cipher/null/memcpy/null_memcpy.c index c260ffb..45ad297 100644 --- a/src/crypto/cipher/null/memcpy/null_memcpy.c +++ b/src/crypto/cipher/null/memcpy/null_memcpy.c @@ -24,7 +24,7 @@ */ -#include "../../../../fastd.h" +#include "../../../../crypto.h" static fastd_cipher_context_t* null_initialize(fastd_context_t *ctx UNUSED) { diff --git a/src/crypto/cipher/salsa20/nacl/salsa20_nacl.c b/src/crypto/cipher/salsa20/nacl/salsa20_nacl.c index cb78afc..93daad3 100644 --- a/src/crypto/cipher/salsa20/nacl/salsa20_nacl.c +++ b/src/crypto/cipher/salsa20/nacl/salsa20_nacl.c @@ -24,7 +24,7 @@ */ -#include "../../../../fastd.h" +#include "../../../../crypto.h" #include diff --git a/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c b/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c index edf5843..2703f0e 100644 --- a/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c +++ b/src/crypto/cipher/salsa2012/nacl/salsa2012_nacl.c @@ -24,7 +24,7 @@ */ -#include "../../../../fastd.h" +#include "../../../../crypto.h" #include diff --git a/src/crypto/mac/ghash/builtin/ghash_builtin.c b/src/crypto/mac/ghash/builtin/ghash_builtin.c index 8793627..0af30ed 100644 --- a/src/crypto/mac/ghash/builtin/ghash_builtin.c +++ b/src/crypto/mac/ghash/builtin/ghash_builtin.c @@ -24,7 +24,7 @@ */ -#include "../../../../fastd.h" +#include "../../../../crypto.h" struct fastd_mac_state { diff --git a/src/crypto/mac/macs.c.in b/src/crypto/mac/macs.c.in index 5adca10..43031ee 100644 --- a/src/crypto/mac/macs.c.in +++ b/src/crypto/mac/macs.c.in @@ -24,8 +24,8 @@ */ -#include #include +#include @MAC_DEFINITIONS@ -- cgit v1.2.3