Merge remote-tracking branch 'purple/openssl' into openssl

2018-11-24 10:08:12 -05:00
parent f385c624c7 f7e9975192
commit 16b3108719
66 changed files with 741 additions and 224 deletions
--- a/libi2pd/Poly1305.h
+++ b/libi2pd/Poly1305.h
@@ -9,7 +9,9 @@
 #define LIBI2PD_POLY1305_H
 #include <cstdint>
 #include <cstring>
+#include "Crypto.h"

+#if LEGACY_OPENSSL
 namespace i2p
 {
 namespace crypto
@@ -254,5 +256,6 @@ namespace crypto

 }
 }
+#endif

 #endif