From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jul 2018 23:56:42 +0000 (-0400)
Subject: Fix issues with crypto_ope compilation now that crypto.h is gone
X-Git-Tag: tor-0.3.5.1-alpha~92^2~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4c0a0e81eb3616d7d66806e9ac8ea7c8d3bf439;p=thirdparty%2Ftor.git

Fix issues with crypto_ope compilation now that crypto.h is gone
---

diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c
index ca42ae4341..fd5d5f3770 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 7dcad7b4b2..4e7b952327 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"