diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 2 | ||||
| -rw-r--r-- | src/common/updates.cpp | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 37 | ||||
| -rw-r--r-- | utils/gpg_keys/kenshi84.asc | 50 |
5 files changed, 77 insertions, 17 deletions
@@ -21,7 +21,8 @@ Copyright (c) 2014-2017, The Monero Project | OSX 10.10 | amd64 | [](https://build.getmonero.org/builders/monero-static-osx-10.10) | OSX 10.11 | amd64 | [](https://build.getmonero.org/builders/monero-static-osx-10.11) | OSX 10.12 | amd64 | [](https://build.getmonero.org/builders/monero-static-osx-10.12) -| FreeBSD 10.3 | amd64 | [](https://build.getmonero.org/builders/monero-static-freebsd64) +| FreeBSD 11 | amd64 | [](https://build.getmonero.org/builders/monero-static-freebsd64) +| DragonFly BSD 4.6 | amd64 | [](https://build.getmonero.org/builders/monero-static-dragonflybsd-amd64) | Windows (MSYS2/MinGW) | i686 | [](https://build.getmonero.org/builders/monero-static-win32) | Windows (MSYS2/MinGW) | amd64 | [](https://build.getmonero.org/builders/monero-static-win64) diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 995674abd..cb617bb9a 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -88,7 +88,7 @@ static const char *get_default_categories(int level) switch (level) { case 0: - categories = "*:WARNING,net:FATAL,global:INFO,verify:FATAL,stacktrace:INFO"; + categories = "*:WARNING,net:FATAL,net.p2p:FATAL,global:INFO,verify:FATAL,stacktrace:INFO"; break; case 1: categories = "*:WARNING,global:INFO,stacktrace:INFO"; diff --git a/src/common/updates.cpp b/src/common/updates.cpp index 936106881..c84566f57 100644 --- a/src/common/updates.cpp +++ b/src/common/updates.cpp @@ -96,7 +96,7 @@ namespace tools std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version) { - static const char base[] = "https://downloads.getmonero.org/"; + static const char base[] = "https://updates.getmonero.org/"; #ifdef _WIN32 static const char extension[] = ".zip"; #else diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 4b460b4fb..c96389ac7 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1100,7 +1100,7 @@ namespace cryptonote return true; std::string version, hash; - MDEBUG("Checking for a new " << software << " version for " << buildtag); + MCDEBUG("updates", "Checking for a new " << software << " version for " << buildtag); if (!tools::check_updates(software, buildtag, m_testnet, version, hash)) return false; @@ -1121,28 +1121,37 @@ namespace cryptonote filename = std::string(software) + "-update-" + version; boost::filesystem::path path(epee::string_tools::get_current_module_folder()); path /= filename; - if (!tools::download(path.string(), url)) - { - MERROR("Failed to download " << url); - return false; - } + crypto::hash file_hash; - if (!tools::sha256sum(path.string(), file_hash)) + if (!tools::sha256sum(path.string(), file_hash) || (hash != epee::string_tools::pod_to_hex(file_hash))) { - MERROR("Failed to hash " << path); - return false; + MCDEBUG("updates", "We don't have that file already, downloading"); + if (!tools::download(path.string(), url)) + { + MCERROR("updates", "Failed to download " << url); + return false; + } + if (!tools::sha256sum(path.string(), file_hash)) + { + MCERROR("updates", "Failed to hash " << path); + return false; + } + if (hash != epee::string_tools::pod_to_hex(file_hash)) + { + MCERROR("updates", "Download from " << url << " does not match the expected hash"); + return false; + } + MCINFO("updates", "New version downloaded to " << path); } - if (hash != epee::string_tools::pod_to_hex(file_hash)) + else { - MERROR("Download from " << url << " does not match the expected hash"); - return false; + MCDEBUG("updates", "We already have " << path << " with expected hash"); } - MGINFO("New version downloaded to " << path); if (check_updates_level == UPDATES_DOWNLOAD) return true; - MERROR("Download/update not implemented yet"); + MCERROR("updates", "Download/update not implemented yet"); return true; } //----------------------------------------------------------------------------------------------- diff --git a/utils/gpg_keys/kenshi84.asc b/utils/gpg_keys/kenshi84.asc new file mode 100644 index 000000000..d146beac2 --- /dev/null +++ b/utils/gpg_keys/kenshi84.asc @@ -0,0 +1,50 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=ny+7 +-----END PGP PUBLIC KEY BLOCK----- |