diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2013-08-12 21:25:36 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2013-08-12 21:25:36 -0400 |
| commit | d6414c9ff74e3f8076a1e94d3c6074366119900e (patch) | |
| tree | b0620f1f1610b51b386964d6758b5787b6cb7d6f /node/EllipticCurveKeyPair.cpp | |
| parent | 5076c75b079fe02c843ca85dc20821e468b2d7b8 (diff) | |
| download | infinitytier-d6414c9ff74e3f8076a1e94d3c6074366119900e.tar.gz infinitytier-d6414c9ff74e3f8076a1e94d3c6074366119900e.zip | |
Windows compiles! (w/Visual Studio 2012) That's about all it does, but it's a start.
Diffstat (limited to 'node/EllipticCurveKeyPair.cpp')
| -rw-r--r-- | node/EllipticCurveKeyPair.cpp | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/node/EllipticCurveKeyPair.cpp b/node/EllipticCurveKeyPair.cpp index d2e2920a..047b2b4f 100644 --- a/node/EllipticCurveKeyPair.cpp +++ b/node/EllipticCurveKeyPair.cpp @@ -29,6 +29,13 @@ #include <stdlib.h> #include <string.h> +#include "Constants.hpp" + +#ifdef __WINDOWS__ +#include <WinSock2.h> +#include <Windows.h> +#endif + #include <openssl/bn.h> #include <openssl/obj_mac.h> #include <openssl/rand.h> @@ -129,32 +136,9 @@ const EllipticCurveKeyPair &EllipticCurveKeyPair::operator=(const EllipticCurveK bool EllipticCurveKeyPair::generate() { - unsigned char tmp[16384]; EC_KEY *key; int len; - // Make sure OpenSSL libcrypto has sufficient randomness (on most - // platforms it auto-seeds, so this is a sanity check). - if (!RAND_status()) { -#if defined(__APPLE__) || defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux) - FILE *rf = fopen("/dev/urandom","r"); - if (rf) { - fread(tmp,sizeof(tmp),1,rf); - fclose(rf); - } else { - fprintf(stderr,"FATAL: could not open /dev/urandom\n"); - exit(-1); - } - RAND_seed(tmp,sizeof(tmp)); -#else -#ifdef _WIN32 - error need win32; -#else - error; -#endif -#endif - } - key = EC_KEY_new(); if (!key) return false; |