diff options
author | irungentoo <irungentoo@gmail.com> | 2013-07-12 16:35:45 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-07-12 16:35:45 -0400 |
commit | e80ac120e1f5b53e3ac4d337628838a4ea58adc3 (patch) | |
tree | 6950c6382b1fde4148a3250b7e5bc25b51bfb0b1 | |
parent | 79aa715514e7d587695ce0182fdf97537d9d9b85 (diff) |
Build fixed?
-rw-r--r-- | core/net_crypto.h | 4 | ||||
-rw-r--r-- | testing/DHT_test.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/core/net_crypto.h b/core/net_crypto.h index 4c3b53de..2476db10 100644 --- a/core/net_crypto.h +++ b/core/net_crypto.h | |||
@@ -26,10 +26,6 @@ | |||
26 | 26 | ||
27 | #include "Lossless_UDP.h" | 27 | #include "Lossless_UDP.h" |
28 | 28 | ||
29 | //TODO: move this to network.h | ||
30 | #ifndef WIN32 | ||
31 | #include "../nacl/build/Linux/include/amd64/crypto_box.h" //${HOSTNAME%.*} doesn't work... set env var later | ||
32 | #endif | ||
33 | //Our public key. | 29 | //Our public key. |
34 | extern uint8_t self_public_key[crypto_box_PUBLICKEYBYTES]; | 30 | extern uint8_t self_public_key[crypto_box_PUBLICKEYBYTES]; |
35 | extern uint8_t self_secret_key[crypto_box_SECRETKEYBYTES]; | 31 | extern uint8_t self_secret_key[crypto_box_SECRETKEYBYTES]; |
diff --git a/testing/DHT_test.c b/testing/DHT_test.c index 083e4d4b..086cd554 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* DHT test | 1 | /* DHT test |
2 | * A file with a main that runs our DHT for testing. | 2 | * A file with a main that runs our DHT for testing. |
3 | * | 3 | * |
4 | * Compile with: gcc -O2 -Wall -o test ../core/network.c DHT_test.c | 4 | * Compile with: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/* DHT_test.c |
5 | * | 5 | * |
6 | * Command line arguments are the ip, port and public key of a node. | 6 | * Command line arguments are the ip, port and public key of a node. |
7 | * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | 7 | * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |