]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix unittest compilation with --disable-curve25519
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Mar 2014 17:52:50 +0000 (13:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Mar 2014 17:53:32 +0000 (13:53 -0400)
This is a fix for 9700, which we already fixed in 0.2.5.x, but which
got left in 0.2.4.x.

This is a partial backport of a0a855d586d99540277014ccd3

changes/bug9700 [new file with mode: 0644]
src/test/test.c

diff --git a/changes/bug9700 b/changes/bug9700
new file mode 100644 (file)
index 0000000..f59f54c
--- /dev/null
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Fix a compilation error when compiling with --disable-cuve25519.
+      Fixes bug 9700; bugfix on 0.2.4.17-rc.
index 4ec879234478269a57a31e17d6d0001f96524b5c..c2911d842c2ef6bba43a70a5cbc351f2e74f8a47 100644 (file)
@@ -56,12 +56,12 @@ double fabs(double x);
 #include "memarea.h"
 #include "onion.h"
 #include "onion_tap.h"
+#include "onion_ntor.h"
 #include "policies.h"
 #include "rephist.h"
 #include "routerparse.h"
 #ifdef CURVE25519_ENABLED
 #include "crypto_curve25519.h"
-#include "onion_ntor.h"
 #endif
 
 #ifdef USE_DMALLOC