diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-17 14:19:29 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-17 14:19:29 -0700 |
| commit | 1254dece5b885d3f396c8c44b659949070694443 (patch) | |
| tree | 5cc013d65bb3262e4fd335bd2106f2ac7fa326f8 | |
| parent | b7ebf6edbfc9ade141f54e5510fed65e77db33fb (diff) | |
| download | infinitytier-1254dece5b885d3f396c8c44b659949070694443.tar.gz infinitytier-1254dece5b885d3f396c8c44b659949070694443.zip | |
Linux build fixes, and build controller.
| -rw-r--r-- | make-linux.mk | 8 | ||||
| -rw-r--r-- | selftest.cpp | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/make-linux.mk b/make-linux.mk index d0d206a1..fe9ecad8 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -93,17 +93,17 @@ endif ifeq ($(ZT_DEBUG),1) DEFS+=-DZT_TRACE override CFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS) - override CXXFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS) + override CXXFLAGS+=-Wall -g -O -std=c++11 -pthread $(INCLUDES) $(DEFS) LDFLAGS= STRIP?=echo # The following line enables optimization for the crypto code, since # C25519 in particular is almost UNUSABLE in -O0 even on a 3ghz box! ext/lz4/lz4.o node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g -pthread $(INCLUDES) $(DEFS) else - CFLAGS?=-O3 -fstack-protector-strong + CFLAGS?=-O3 -fstack-protector override CFLAGS+=-Wall -fPIE -pthread $(INCLUDES) -DNDEBUG $(DEFS) - CXXFLAGS?=-O3 -fstack-protector-strong - override CXXFLAGS+=-Wall -Wno-unused-result -Wreorder -fPIE -fno-rtti -pthread $(INCLUDES) -DNDEBUG $(DEFS) + CXXFLAGS?=-O3 -fstack-protector + override CXXFLAGS+=-Wall -Wno-unused-result -Wreorder -fPIE -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS) LDFLAGS=-pie -Wl,-z,relro,-z,now STRIP?=strip STRIP+=--strip-all diff --git a/selftest.cpp b/selftest.cpp index ab05c9ef..aecccd21 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -501,19 +501,6 @@ static int testCertificate() return -1; } - std::cout << "[certificate] Testing string serialization... "; - CertificateOfMembership copyA(cA.toString()); - CertificateOfMembership copyB(cB.toString()); - if (copyA != cA) { - std::cout << "FAIL" << std::endl; - return -1; - } - if (copyB != cB) { - std::cout << "FAIL" << std::endl; - return -1; - } - std::cout << "PASS" << std::endl; - std::cout << "[certificate] Generating two certificates that should not agree..."; cA = CertificateOfMembership(10000,100,1,idA.address()); cB = CertificateOfMembership(10101,100,1,idB.address()); |