Mercurial > trustbridge
comparison ui/downloader.cpp @ 1088:508c96e72f62
(issue124) Switch server URL and remove some RELEASE_BUILD options
As the test server speaks ECDSA we do not need so much
#ifndef RELEASE_BUILD options anymore.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 12 Sep 2014 15:38:42 +0200 |
| parents | 515345358b71 |
| children | a1e990947172 |
comparison
equal
deleted
inserted
replaced
| 1087:7191addd8a53 | 1088:508c96e72f62 |
|---|---|
| 6 * See LICENSE.txt for details. | 6 * See LICENSE.txt for details. |
| 7 */ | 7 */ |
| 8 #include "downloader.h" | 8 #include "downloader.h" |
| 9 | 9 |
| 10 #ifndef DOWNLOAD_SERVER | 10 #ifndef DOWNLOAD_SERVER |
| 11 #define DOWNLOAD_SERVER "https://www.intevation.de" | 11 #define DOWNLOAD_SERVER "https://tb-devel.intevation.de" |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 #include <QFile> | 14 #include <QFile> |
| 15 #include <QDir> | 15 #include <QDir> |
| 16 #include <QDebug> | 16 #include <QDebug> |
| 34 #include "sslconnection_curl.h" | 34 #include "sslconnection_curl.h" |
| 35 #else | 35 #else |
| 36 #include "sslconnection_bare.h" | 36 #include "sslconnection_bare.h" |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 #ifdef RELEASE_BUILD | |
| 40 static int accept_ciphers[] = { | 39 static int accept_ciphers[] = { |
| 41 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, | 40 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, |
| 42 TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, | 41 TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, |
| 43 TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, | 42 TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, |
| 44 0 | 43 0 |
| 45 }; | 44 }; |
| 46 #else | |
| 47 static int accept_ciphers[] = { | |
| 48 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, | |
| 49 TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, | |
| 50 TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384, | |
| 51 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, | |
| 52 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, | |
| 53 TLS_RSA_WITH_AES_256_CBC_SHA, | |
| 54 0 | |
| 55 }; | |
| 56 #endif | |
| 57 | 45 |
| 58 Downloader::Downloader(QObject* parent, const QString& url, | 46 Downloader::Downloader(QObject* parent, const QString& url, |
| 59 const QByteArray& certificate, | 47 const QByteArray& certificate, |
| 60 const QDateTime& newestSW, | 48 const QDateTime& newestSW, |
| 61 const QDateTime& newestList, | 49 const QDateTime& newestList, |