changed back to <openssl/

Crypto.cpp

@@ -3,15 +3,13 @@
 #include <vector>
 #include <mutex>
 #include <memory>
-#include "Crypto.h"
+#include <openssl/dh.h>
-#include OPENSSL(sha.h)
+#include <openssl/md5.h>
-#include OPENSSL(dh.h)
+#include <openssl/crypto.h>
-#include OPENSSL(md5.h)
-#include OPENSSL(rand.h)
-#include OPENSSL(crypto.h)
 #include "TunnelBase.h"
-#include OPENSSL(ssl.h)
+#include <openssl/ssl.h>
 #include "Log.h"
+#include "Crypto.h"
 
 namespace i2p
 {

Crypto.h

@@ -1,16 +1,14 @@
 #ifndef CRYPTO_H__
 #define CRYPTO_H__
 
-#define OPENSSL(file) <openssl/file>
-
 #include <inttypes.h>
 #include <string>
-#include OPENSSL(bn.h)
+#include <openssl/bn.h>
-#include OPENSSL(dh.h)
+#include <openssl/dh.h>
-#include OPENSSL(aes.h)
+#include <openssl/aes.h>
-#include OPENSSL(dsa.h)
+#include <openssl/dsa.h>
-#include OPENSSL(sha.h)
+#include <openssl/sha.h>
-#include OPENSSL(rand.h)
+#include <openssl/rand.h>
 #include "Base.h"
 
 namespace i2p

Family.cpp

@@ -1,7 +1,7 @@
 #include <string.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
 #include "Crypto.h"
-#include OPENSSL(evp.h)
-#include OPENSSL(ssl.h)
 #include "FS.h"
 #include "Log.h"
 #include "Family.h"

Garlic.cpp

@@ -3,8 +3,6 @@
 #include <map>
 #include <string>
 #include "Crypto.h"
-#include OPENSSL(rand.h)
-#include OPENSSL(sha.h)
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
 #include "Tunnel.h"

I2PControl.cpp

@@ -1,8 +1,7 @@
 #include <stdio.h>
 #include <sstream>
-#include "Crypto.h"
+#include <openssl/x509.h>
-#include OPENSSL(x509.h)
+#include <openssl/pem.h>
-#include OPENSSL(pem.h)
 #include <boost/lexical_cast.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -14,6 +13,7 @@
 #include <boost/property_tree/json_parser.hpp>
 #endif
 
+#include "Crypto.h"
 #include "FS.h"
 #include "Log.h"
 #include "Config.h"

I2PControl.h

@@ -10,7 +10,7 @@
 #include <map>
 #include <set>
 #include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp> // might include openssl
+#include <boost/asio/ssl.hpp> 
 #include <boost/property_tree/ptree.hpp>
 
 namespace i2p

Reseed.cpp

@@ -3,13 +3,12 @@
 #include <sstream>
 #include <boost/regex.hpp>
 #include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp> // might include openssl
+#include <boost/asio/ssl.hpp> 
-#include "Crypto.h"
+#include <openssl/ssl.h>
-#include OPENSSL(bn.h)
+#include <openssl/err.h>
-#include OPENSSL(ssl.h)
-#include OPENSSL(err.h)
 #include <zlib.h>
 
+#include "Crypto.h"
 #include "I2PEndian.h"
 #include "Reseed.h"
 #include "FS.h"

Signature.h

@@ -3,14 +3,12 @@
 
 #include <inttypes.h>
 #include <string.h>
+#include <openssl/dsa.h>
+#include <openssl/ec.h>
+#include <openssl/ecdsa.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
 #include "Crypto.h"
-#include OPENSSL(sha.h)
-#include OPENSSL(dsa.h)
-#include OPENSSL(ec.h)
-#include OPENSSL(ecdsa.h)
-#include OPENSSL(rsa.h)
-#include OPENSSL(rand.h)
-#include OPENSSL(evp.h)
 
 namespace i2p
 {