diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2015-11-12 16:48:42 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2015-11-12 16:48:42 -0800 |
| commit | 54f68280bd65589fc858901f1c5c4ed8588862c3 (patch) | |
| tree | b9cea6e4a538f80f1db1217409ce9ff0e9b52193 /node | |
| parent | bacb53fe8fdfa1ecd429cdfb07de96ec0fb0589b (diff) | |
| download | infinitytier-54f68280bd65589fc858901f1c5c4ed8588862c3.tar.gz infinitytier-54f68280bd65589fc858901f1c5c4ed8588862c3.zip | |
Minor Windows build fixes. Builds on VS2012 again.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Hashtable.hpp | 2 | ||||
| -rw-r--r-- | node/Utils.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/node/Hashtable.hpp b/node/Hashtable.hpp index e3512fef..aee24989 100644 --- a/node/Hashtable.hpp +++ b/node/Hashtable.hpp @@ -103,7 +103,7 @@ public: private: unsigned long _idx; Hashtable *_ht; - Hashtable::_Bucket *_b; + _Bucket *_b; }; friend class Hashtable::Iterator; diff --git a/node/Utils.cpp b/node/Utils.cpp index 6c5d8c7d..10146e6c 100644 --- a/node/Utils.cpp +++ b/node/Utils.cpp @@ -168,14 +168,14 @@ void Utils::getSecureRandom(void *buf,unsigned int bytes) fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n"); exit(1); } - s20.init(s20key,256,s20key,8); + s20.init(s20key,256,s20key); } if (!CryptGenRandom(cryptProvider,(DWORD)bytes,(BYTE *)buf)) { fprintf(stderr,"FATAL ERROR: Utils::getSecureRandom() CryptGenRandom failed!\r\n"); exit(1); } - s20.encrypt(buf,buf,bytes); + s20.encrypt12(buf,buf,bytes); #else // not __WINDOWS__ |