diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-21 13:07:22 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-21 13:07:22 -0800 |
| commit | 370dd6c4da6acff85947cef365e4df48c00d0863 (patch) | |
| tree | 96dd0db7a3fcecb6354276ed23c6274c5b7804d7 /node/SoftwareUpdater.cpp | |
| parent | 06ca24e8e2b663842fee7daabac4a2652da5a834 (diff) | |
| download | infinitytier-370dd6c4da6acff85947cef365e4df48c00d0863.tar.gz infinitytier-370dd6c4da6acff85947cef365e4df48c00d0863.zip | |
Several things:
(1) Add a bunch of tedious type casts to eliminate unnecessary compiler warnings on Windows X64 builds.
(2) Some EthernetTap work to integrate Windows custom IOCTL for multicast group lookup (not done quite yet).
(3) Dump some more info in selftest to make sure our Windows path lookup functions are returning sane results.
Diffstat (limited to 'node/SoftwareUpdater.cpp')
| -rw-r--r-- | node/SoftwareUpdater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/SoftwareUpdater.cpp b/node/SoftwareUpdater.cpp index db884d80..0ce946ad 100644 --- a/node/SoftwareUpdater.cpp +++ b/node/SoftwareUpdater.cpp @@ -113,7 +113,7 @@ bool SoftwareUpdater::validateUpdate( std::map< Address,Identity >::const_iterator updateAuthority = ZT_DEFAULTS.updateAuthorities.find(signedBy); if (updateAuthority == ZT_DEFAULTS.updateAuthorities.end()) return false; - return updateAuthority->second.verify(data,len,signature.data(),signature.length()); + return updateAuthority->second.verify(data,len,signature.data(),(unsigned int)signature.length()); } void SoftwareUpdater::_cbHandleGetLatestVersionInfo(void *arg,int code,const std::string &url,bool onDisk,const std::string &body) @@ -176,7 +176,7 @@ void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const s const RuntimeEnvironment *_r = (const RuntimeEnvironment *)upd->_r; Mutex::Lock _l(upd->_lock); - if (!validateUpdate(body.data(),body.length(),upd->_signedBy,upd->_signature)) { + if (!validateUpdate(body.data(),(unsigned int)body.length(),upd->_signedBy,upd->_signature)) { LOG("software update aborted: update fetched from '%s' failed signature check (got %u bytes)",url.c_str(),(unsigned int)body.length()); upd->_status = UPDATE_STATUS_IDLE; return; |