summaryrefslogtreecommitdiffstats
path: root/application/MultiMC.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-19 22:28:51 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-19 22:28:51 +0200
commitd0b31da4b53e6aa4630dec9eef9435246889d6c4 (patch)
tree5f003e15ab7515b7359ac1bf7ada001d45268ccd /application/MultiMC.cpp
parent2ad9e6393f1e4aaa31a4bba3639f12e2761cfd53 (diff)
downloadMultiMC-d0b31da4b53e6aa4630dec9eef9435246889d6c4.tar
MultiMC-d0b31da4b53e6aa4630dec9eef9435246889d6c4.tar.gz
MultiMC-d0b31da4b53e6aa4630dec9eef9435246889d6c4.tar.lz
MultiMC-d0b31da4b53e6aa4630dec9eef9435246889d6c4.tar.xz
MultiMC-d0b31da4b53e6aa4630dec9eef9435246889d6c4.zip
GH-960 possible fix for missing OSX ca certs
Diffstat (limited to 'application/MultiMC.cpp')
-rw-r--r--application/MultiMC.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index aae8d154..122890d1 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -236,6 +236,8 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
ENV.updateProxySettings(proxyTypeStr, addr, port, user, pass);
}
+ initSSL();
+
m_translationChecker->downloadTranslations();
//FIXME: what to do with these?
@@ -271,6 +273,17 @@ MultiMC::~MultiMC()
}
}
+void MultiMC::initSSL()
+{
+#ifdef Q_OS_MAC
+ Q_INIT_RESOURCE(certs);
+ QFile equifaxFile(":/certs/Equifax_Secure_Certificate_Authority.pem");
+ equifaxFile.open(QIODevice::ReadOnly);
+ QSslCertificate equifaxCert(equifaxFile.readAll(), QSsl::Pem);
+ QSslSocket::addDefaultCaCertificate(equifaxCert);
+#endif
+}
+
void MultiMC::initTranslations()
{
QLocale locale(m_settings->get("Language").toString());