commit a4c0a0e81eb3616d7d66806e9ac8ea7c8d3bf439 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 19:56:42 2018 -0400

Fix issues with crypto_ope compilation now that crypto.h is gone --- src/lib/crypt_ops/crypto_ope.c | 2 +- src/test/test_crypto_ope.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index ca42ae434..fd5d5f377 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -18,8 +18,8 @@

#define CRYPTO_OPE_PRIVATE #include "lib/crypt_ops/crypto_ope.h" -#include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/arch/bytes.h" diff --git a/src/test/test_crypto_ope.c b/src/test/test_crypto_ope.c index 7dcad7b4b..4e7b95232 100644 --- a/src/test/test_crypto_ope.c +++ b/src/test/test_crypto_ope.c @@ -7,9 +7,11 @@

#define CRYPTO_OPE_PRIVATE

+#include "lib/cc/compat_compiler.h" #include "lib/crypt_ops/crypto_ope.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "lib/encoding/binascii.h" +#include "lib/malloc/malloc.h" #include "test/test.h" #include "tinytest.h"