summaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-28 10:47:46 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-28 10:47:46 -0400
commit94bff894f9e127888f15ec2333f86d0388e4da7d (patch)
treeaa46d8004f3b51ef99484ac8ade17f78ce418ac3 /src/ext
parentc1bfa65211257e5efb89c5ebc534339d52fa77c4 (diff)
downloadtor-94bff894f9e127888f15ec2333f86d0388e4da7d.tar.gz
tor-94bff894f9e127888f15ec2333f86d0388e4da7d.zip
Fix a large pile of solaris warnings for bug 19767.
In nearly all cases, this is a matter of making sure that we include orconfig.h before we include any standard c headers.
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/ed25519/donna/ed25519_tor.c2
-rw-r--r--src/ext/ed25519/ref10/keypair.c3
-rw-r--r--src/ext/ed25519/ref10/open.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c
index 52b259dfe1..5f3fdc5dae 100644
--- a/src/ext/ed25519/donna/ed25519_tor.c
+++ b/src/ext/ed25519/donna/ed25519_tor.c
@@ -34,7 +34,7 @@
#define ED25519_FN2(fn,suffix) ED25519_FN3(fn,suffix)
#define ED25519_FN(fn) ED25519_FN2(fn,ED25519_SUFFIX)
-
+#include "orconfig.h"
#include "ed25519-donna.h"
#include "ed25519_donna_tor.h"
#include "ed25519-randombytes.h"
diff --git a/src/ext/ed25519/ref10/keypair.c b/src/ext/ed25519/ref10/keypair.c
index 7ddbaa971e..68a88f9adc 100644
--- a/src/ext/ed25519/ref10/keypair.c
+++ b/src/ext/ed25519/ref10/keypair.c
@@ -1,6 +1,7 @@
/* Modified for Tor: new API, 64-byte secret keys. */
-#include <string.h>
+
#include "randombytes.h"
+#include <string.h>
#include "crypto_sign.h"
#include "crypto_hash_sha512.h"
#include "ge.h"
diff --git a/src/ext/ed25519/ref10/open.c b/src/ext/ed25519/ref10/open.c
index 9dbeb4cdd0..3ab7b7d6e7 100644
--- a/src/ext/ed25519/ref10/open.c
+++ b/src/ext/ed25519/ref10/open.c
@@ -1,6 +1,7 @@
/* (Modified by Tor to verify signature separately from message) */
-#include <string.h>
+
#include "crypto_sign.h"
+#include <string.h>
#include "crypto_hash_sha512.h"
#include "crypto_verify_32.h"
#include "ge.h"