diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 12:49:36 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-02 12:49:36 -0700 |
| commit | 3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8 (patch) | |
| tree | ca93fd3ca8dc6fb9afffcc78b0167a3c6d204eec /selftest.cpp | |
| parent | f0be5e814eb0c9496d6c163e2d5bc213e7b483c4 (diff) | |
| parent | 79efceb57bd71e91f5733dc4c54b3213a3f95636 (diff) | |
| download | infinitytier-3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8.tar.gz infinitytier-3d6c1860ca8169f618ad70ae92e4a8cd2f4746c8.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'selftest.cpp')
| -rw-r--r-- | selftest.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/selftest.cpp b/selftest.cpp index a0b3c951..27c81c25 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -187,6 +187,12 @@ static int testCrypto() } std::cout << "PASS" << std::endl; +#ifdef ZT_SALSA20_SSE + std::cout << "[crypto] Salsa20 SSE: ENABLED" << std::endl; +#else + std::cout << "[crypto] Salsa20 SSE: DISABLED" << std::endl; +#endif + std::cout << "[crypto] Benchmarking Salsa20/12... "; std::cout.flush(); { unsigned char *bb = (unsigned char *)::malloc(1234567); |