Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2922 

a1d44f27 updates: use https for updates (moneromooo-monero)
472a93c8 download: SSL suport (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-12-25 21:18:29 +02:00
parent 2b00899bb2 a1d44f2746
commit 32c14e0f37
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/download.cpp
View File

@ -147,9 +147,10 @@ namespace tools
lock.unlock(); lock.unlock();
uint16_t port = u_c.port ? u_c.port : 80; bool ssl = u_c.schema == "https";
uint16_t port = u_c.port ? u_c.port : ssl ? 443 : 80;
MDEBUG("Connecting to " << u_c.host << ":" << port); MDEBUG("Connecting to " << u_c.host << ":" << port);
client.set_server(u_c.host, std::to_string(port), boost::none); client.set_server(u_c.host, std::to_string(port), boost::none, ssl);
if (!client.connect(std::chrono::seconds(30))) if (!client.connect(std::chrono::seconds(30)))
{ {
boost::lock_guard<boost::mutex> lock(control->mutex); boost::lock_guard<boost::mutex> lock(control->mutex);

2
src/common/updates.cpp
View File

@ -99,7 +99,7 @@ namespace tools
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user) std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user)
{ {
const char *base = user ? "https://downloads.getmonero.org/" : "http://updates.getmonero.org/"; const char *base = user ? "https://downloads.getmonero.org/" : "https://updates.getmonero.org/";
#ifdef _WIN32 #ifdef _WIN32
static const char *extension = strncmp(buildtag.c_str(), "install-", 8) ? ".zip" : ".exe"; static const char *extension = strncmp(buildtag.c_str(), "install-", 8) ? ".zip" : ".exe";
#else #else