diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-11 16:52:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-11 16:52:24 -0400 |
| commit | 64521a9d355da9f21d81c8a82056e544372685b2 (patch) | |
| tree | a3ce5b736e41db284f4ae2b5a925ac5195c77acf /src/ext/ed25519 | |
| parent | 77e2be06f6ff9c7328144fe5df3e3bac64106449 (diff) | |
| parent | 25513ae174d80a62ca0a8dcca52683089be95ea3 (diff) | |
| download | tor-64521a9d355da9f21d81c8a82056e544372685b2.tar.gz tor-64521a9d355da9f21d81c8a82056e544372685b2.zip | |
Merge remote-tracking branch 'public/solaris_warnings_028'
Diffstat (limited to 'src/ext/ed25519')
| -rw-r--r-- | src/ext/ed25519/donna/ed25519_tor.c | 2 | ||||
| -rw-r--r-- | src/ext/ed25519/ref10/keypair.c | 3 | ||||
| -rw-r--r-- | src/ext/ed25519/ref10/open.c | 3 |
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 07f6a0f23a..9537ae66a1 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" |