- tor-commits - lists.torproject.org

[vidalia/alpha] Port BridgeDownloader from QHttp to QtNetwork
by chiiph＠torproject.org 03 May '11

03 May '11

commit cbfe5e908026729818d91d2fbb17a92469574abd Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri Apr 15 12:34:01 2011 -0300 Port BridgeDownloader from QHttp to QtNetwork QHttp is deprecated in the latest versions. Also, added a check for the certificate sha1 digest. --- src/vidalia/config/BridgeDownloader.cpp | 71 +++++++++----------- src/vidalia/config/BridgeDownloader.h | 17 ++--- .../config/BridgeDownloaderProgressDialog.cpp | 2 +- .../config/BridgeDownloaderProgressDialog.h | 2 +- src/vidalia/config/NetworkPage.cpp | 4 +- 5 files changed, 44 insertions(+), 52 deletions(-) diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp index d70034d..15d73cb 100644 --- a/src/vidalia/config/BridgeDownloader.cpp +++ b/src/vidalia/config/BridgeDownloader.cpp @@ -16,34 +16,26 @@ #include "BridgeDownloader.h" #include "Vidalia.h" -#include <QSslSocket> - #define BRIDGEDB_HOST "bridges.torproject.org" #define BRIDGEDB_PORT 443 - +#define BRIDGEDB_SHA1 "a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25" BridgeDownloader::BridgeDownloader(QObject *parent) - : QObject(parent), - _requestId(0) + : QObject(parent) { - _https = new QHttp(BRIDGEDB_HOST, QHttp::ConnectionModeHttps, - BRIDGEDB_PORT, this); - - connect(_https, SIGNAL(stateChanged(int)), - this, SLOT(httpsStateChanged(int))); - connect(_https, SIGNAL(requestFinished(int, bool)), - this, SLOT(httpsRequestFinished(int, bool))); - connect(_https, SIGNAL(dataReadProgress(int, int)), - this, SIGNAL(downloadProgress(int, int))); - connect(_https, SIGNAL(sslErrors(QList<QSslError>)), - this, SLOT(sslErrors(QList<QSslError>))); + _https = new QNetworkAccessManager(); + + connect(_https, SIGNAL(finished(QNetworkReply *)), + this, SLOT(httpsRequestFinished(QNetworkReply *))); + connect(_https, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)), + this, SLOT(sslErrors(QNetworkReply *, QList<QSslError>))); } void BridgeDownloader::setProxy(const QString &host, int port, const QString &username, const QString &password) { - _https->setProxy(host, port, username, password); + _https->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port, username, password)); } bool @@ -82,16 +74,18 @@ BridgeDownloader::startHttpsDownload() emit statusChanged(tr("Starting HTTPS bridge request...")); emit downloadProgress(0, 0); - _requestId = _https->get("/?format=plain"); - vInfo("Sending an HTTPS bridge request to %1:%2 (id %3).").arg(BRIDGEDB_HOST) - .arg(BRIDGEDB_PORT) - .arg(_requestId); + _reply = _https->get(QNetworkRequest(QUrl("https://bridges.torproject.org/?format=plain"))); + connect(_reply, SIGNAL(downloadProgress(qint64, qint64)), + this, SIGNAL(downloadProgress(qint64, qint64))); + vInfo("Sending an HTTPS bridge request to %1:%2.").arg(BRIDGEDB_HOST) + .arg(BRIDGEDB_PORT); } void BridgeDownloader::cancelBridgeRequest() { - _https->abort(); + _reply->close(); + disconnect(_reply, 0, 0, 0); } void @@ -117,20 +111,16 @@ BridgeDownloader::httpsStateChanged(int state) } void -BridgeDownloader::httpsRequestFinished(int id, bool error) +BridgeDownloader::httpsRequestFinished(QNetworkReply *reply) { - if (id != _requestId) - return; - - if (error) { - QString errorString = _https->errorString(); - vWarn("Bridge request failed (id %1): %2").arg(id).arg(errorString); + if (reply->error() != QNetworkReply::NoError) { + QString errorString = reply->errorString(); + vWarn("Bridge request failed: %2").arg(errorString); emit bridgeRequestFailed(errorString); } else { - QByteArray response = _https->readAll(); - vInfo("Bridge request complete (id %1): received %2 bytes.").arg(id) - .arg(response.size()); + QByteArray response = reply->readAll(); + vInfo("Bridge request complete: received %2 bytes.").arg(response.size()); QStringList bridges, lines = QString(response).split("\n"); foreach (QString line, lines) { @@ -140,22 +130,27 @@ BridgeDownloader::httpsRequestFinished(int id, bool error) } emit bridgeRequestFinished(bridges); } - _https->close(); + _reply->close(); + disconnect(_reply,0,0,0); } void -BridgeDownloader::sslErrors(const QList<QSslError> &sslErrors) +BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErrors) { QString errorString; QStringList errorStrings; - vWarn("%1 SSL error(s) when requesting bridge information (id %2):") - .arg(sslErrors.size()) - .arg(_requestId); + vWarn("%1 SSL error(s) when requesting bridge information:") + .arg(sslErrors.size()); foreach (QSslError sslError, sslErrors) { errorString = sslError.errorString(); errorStrings << errorString; vWarn(" SSL Error: %1").arg(errorString); } -} + // Check if the certificate is the one we expect + if(_reply->sslConfiguration().peerCertificate().digest(QCryptographicHash::Sha1)==QByteArray::fromHex(BRIDGEDB_SHA1)) { + _reply->ignoreSslErrors(); + } else + vWarn("There's been a problem with the certificate."); +} diff --git a/src/vidalia/config/BridgeDownloader.h b/src/vidalia/config/BridgeDownloader.h index 0cb87f4..cf30979 100644 --- a/src/vidalia/config/BridgeDownloader.h +++ b/src/vidalia/config/BridgeDownloader.h @@ -16,10 +16,7 @@ #ifndef _BRIDGEDOWNLOADER_H #define _BRIDGEDOWNLOADER_H -#include <QHttp> -#include <QSslError> -#include <QStringList> - +#include <QtNetwork> class BridgeDownloader : public QObject { @@ -65,7 +62,7 @@ signals: * have been read so far. Note that total may be 0 if the expected * total size of the response is not known. */ - void downloadProgress(int done, int total); + void downloadProgress(qint64 done, qint64 total); /** Emitted when the status of the bridge request changes. status * describes the new current state of the request. @@ -98,14 +95,14 @@ private slots: * signal is ignored since it is the result of a close() or abort() * request. */ - void httpsRequestFinished(int id, bool error); + void httpsRequestFinished(QNetworkReply *reply); /** Called when the HTTPS connection encounters one or more * sslErrors. Currently the errors are just logged and * bridgeRequestFailed() is not emitted, since QHttp will also * emit */ - void sslErrors(const QList<QSslError> &sslErrors); + void sslErrors(QNetworkReply *, const QList<QSslError> &sslErrors); private: /** Initiates an HTTPS connection to bridges.torproject.org to start @@ -115,10 +112,10 @@ private: /** Used to connect to the bridge database, send an HTTPS request for * new bridge addresses and then read the response. */ - QHttp* _https; + QNetworkAccessManager* _https; - /** Unique numeric identifier of the current bridge request. */ - int _requestId; + /** Identifier of the current bridge request */ + QNetworkReply *_reply; }; #endif diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp index b4d8e28..f16daa8 100644 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp +++ b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp @@ -46,7 +46,7 @@ BridgeDownloaderProgressDialog::setStatus(const QString &status) } void -BridgeDownloaderProgressDialog::setDownloadProgress(int done, int total) +BridgeDownloaderProgressDialog::setDownloadProgress(qint64 done, qint64 total) { ui.progressBar->setRange(0, total); ui.progressBar->setValue(done); diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.h b/src/vidalia/config/BridgeDownloaderProgressDialog.h index 86fb0d3..d9d505f 100644 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.h +++ b/src/vidalia/config/BridgeDownloaderProgressDialog.h @@ -39,7 +39,7 @@ public slots: * maximum steps. If value and maximum are both 0, * then a "busy" progress bar is displayed. */ - void setDownloadProgress(int value, int maximum); + void setDownloadProgress(qint64 value, qint64 maximum); /** Called when the bridge download completes successfully and discards * the progress dialog with an Accept result code. bridges diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index f5bbc72..7154334 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -389,8 +389,8 @@ NetworkPage::findBridges() connect(_bridgeDownloader, SIGNAL(statusChanged(QString)), dlg, SLOT(setStatus(QString))); - connect(_bridgeDownloader, SIGNAL(downloadProgress(int, int)), - dlg, SLOT(setDownloadProgress(int, int))); + connect(_bridgeDownloader, SIGNAL(downloadProgress(qint64, qint64)), + dlg, SLOT(setDownloadProgress(qint64, qint64))); connect(_bridgeDownloader, SIGNAL(bridgeRequestFailed(QString)), dlg, SLOT(bridgeRequestFailed(QString))); connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)),

1 0

[vidalia/alpha] Handle the validation by adding DigiCert's CAs
by chiiph＠torproject.org 03 May '11

03 May '11

commit 2470c0bda9923a67710fce2ed5fbcc03c3f018f2 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu Apr 28 13:20:46 2011 -0300 Handle the validation by adding DigiCert's CAs --- src/vidalia/Vidalia.cpp | 9 +++++++++ src/vidalia/config/BridgeDownloader.cpp | 7 ------- src/vidalia/res/DigiCertAssuredCA.crt | 22 ++++++++++++++++++++++ src/vidalia/res/DigiCertCA.crt | 22 ++++++++++++++++++++++ src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 +++++++++++++++++++++++ src/vidalia/res/vidalia.qrc | 3 +++ 6 files changed, 79 insertions(+), 7 deletions(-) diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index f88c94f..5c22da3 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -509,5 +509,14 @@ Vidalia::loadDefaultCaCertificates() const if (! QSslSocket::addDefaultCaCertificates(":/pki/EquifaxSecureCA.crt")) vWarn("Failed to add the Equifax Secure CA certificate to the default CA " "certificate database."); + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA.crt")) + vWarn("Failed to add the DigiCert Global CA certificate to the default CA " + "certificate database."); + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA2.crt")) + vWarn("Failed to add the DigiCert Assured CA certificate to the default CA " + "certificate database."); + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA3.crt")) + vWarn("Failed to add the DigiCert High Assurance CA certificate to the default CA " + "certificate database."); } diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp index 15d73cb..f1ac91a 100644 --- a/src/vidalia/config/BridgeDownloader.cpp +++ b/src/vidalia/config/BridgeDownloader.cpp @@ -18,7 +18,6 @@ #define BRIDGEDB_HOST "bridges.torproject.org" #define BRIDGEDB_PORT 443 -#define BRIDGEDB_SHA1 "a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25" BridgeDownloader::BridgeDownloader(QObject *parent) : QObject(parent) @@ -147,10 +146,4 @@ BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErr errorStrings << errorString; vWarn(" SSL Error: %1").arg(errorString); } - - // Check if the certificate is the one we expect - if(_reply->sslConfiguration().peerCertificate().digest(QCryptographicHash::Sha1)==QByteArray::fromHex(BRIDGEDB_SHA1)) { - _reply->ignoreSslErrors(); - } else - vWarn("There's been a problem with the certificate."); } diff --git a/src/vidalia/res/DigiCertAssuredCA.crt b/src/vidalia/res/DigiCertAssuredCA.crt new file mode 100644 index 0000000..2731638 --- /dev/null +++ b/src/vidalia/res/DigiCertAssuredCA.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv +b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c +JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP +mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ +wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 +VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ +AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB +AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun +pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC +dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf +fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm +NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx +H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- diff --git a/src/vidalia/res/DigiCertCA.crt b/src/vidalia/res/DigiCertCA.crt new file mode 100644 index 0000000..fd4341d --- /dev/null +++ b/src/vidalia/res/DigiCertCA.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- diff --git a/src/vidalia/res/DigiCertHighAssuranceCA.crt b/src/vidalia/res/DigiCertHighAssuranceCA.crt new file mode 100644 index 0000000..9e6810a --- /dev/null +++ b/src/vidalia/res/DigiCertHighAssuranceCA.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j +ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 +LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug +RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm ++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW +PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM +xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB +Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 +hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg +EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA +FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec +nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z +eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF +hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 +Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep ++OkuE6N36B9K +-----END CERTIFICATE----- diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc index 68f84aa..cfb1004 100644 --- a/src/vidalia/res/vidalia.qrc +++ b/src/vidalia/res/vidalia.qrc @@ -310,6 +310,9 @@ </qresource> <qresource prefix="/pki"> <file>EquifaxSecureCA.crt</file> + <file>DigiCertCA.crt</file> + <file>DigiCertAssuredCA.crt</file> + <file>DigiCertHighAssuranceCA.crt</file> </qresource> <qresource prefix="/geoip"> <file>country-coordinates.csv</file>

1 0

[vidalia/alpha] Fix paths for the new certificates
by chiiph＠torproject.org 03 May '11

03 May '11

commit 9406862b624f31821711c67e2da6ebca5438abc2 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri Apr 29 14:26:30 2011 -0300 Fix paths for the new certificates --- src/vidalia/Vidalia.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index 5c22da3..91c6dfb 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -512,10 +512,10 @@ Vidalia::loadDefaultCaCertificates() const if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA.crt")) vWarn("Failed to add the DigiCert Global CA certificate to the default CA " "certificate database."); - if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA2.crt")) + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertAssuredCA.crt")) vWarn("Failed to add the DigiCert Assured CA certificate to the default CA " "certificate database."); - if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA3.crt")) + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertHighAssuranceCA.crt")) vWarn("Failed to add the DigiCert High Assurance CA certificate to the default CA " "certificate database."); }

1 0

[vidalia/alpha] Merge branch 'bug2835_getbridges'
by chiiph＠torproject.org 03 May '11

03 May '11

commit d92bf67ec79ac110ef833bc4bccd9dede49ad2d6 Merge: 8d691c7 9406862 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 3 11:38:01 2011 -0300 Merge branch 'bug2835_getbridges' src/vidalia/Vidalia.cpp | 9 +++ src/vidalia/config/BridgeDownloader.cpp | 64 ++++++++------------ src/vidalia/config/BridgeDownloader.h | 17 ++--- .../config/BridgeDownloaderProgressDialog.cpp | 2 +- .../config/BridgeDownloaderProgressDialog.h | 2 +- src/vidalia/config/NetworkPage.cpp | 4 +- src/vidalia/res/DigiCertAssuredCA.crt | 22 +++++++ src/vidalia/res/DigiCertCA.crt | 22 +++++++ src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 +++++++ src/vidalia/res/vidalia.qrc | 3 + 10 files changed, 116 insertions(+), 52 deletions(-)

1 0

[vidalia/alpha] Merge branch 'master' into alpha
by chiiph＠torproject.org 03 May '11

03 May '11

commit ec69a3999aed791d0a529f4c1ec283e1ead3f9f0 Merge: 8941866 d92bf67 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 3 11:38:12 2011 -0300 Merge branch 'master' into alpha src/vidalia/Vidalia.cpp | 9 +++ src/vidalia/config/BridgeDownloader.cpp | 64 ++++++++------------ src/vidalia/config/BridgeDownloader.h | 17 ++--- .../config/BridgeDownloaderProgressDialog.cpp | 2 +- .../config/BridgeDownloaderProgressDialog.h | 2 +- src/vidalia/config/NetworkPage.cpp | 4 +- src/vidalia/res/DigiCertAssuredCA.crt | 22 +++++++ src/vidalia/res/DigiCertCA.crt | 22 +++++++ src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 +++++++ src/vidalia/res/vidalia.qrc | 3 + 10 files changed, 116 insertions(+), 52 deletions(-)

1 0

[vidalia/master] Port BridgeDownloader from QHttp to QtNetwork
by chiiph＠torproject.org 03 May '11

03 May '11

commit cbfe5e908026729818d91d2fbb17a92469574abd Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri Apr 15 12:34:01 2011 -0300 Port BridgeDownloader from QHttp to QtNetwork QHttp is deprecated in the latest versions. Also, added a check for the certificate sha1 digest. --- src/vidalia/config/BridgeDownloader.cpp | 71 +++++++++----------- src/vidalia/config/BridgeDownloader.h | 17 ++--- .../config/BridgeDownloaderProgressDialog.cpp | 2 +- .../config/BridgeDownloaderProgressDialog.h | 2 +- src/vidalia/config/NetworkPage.cpp | 4 +- 5 files changed, 44 insertions(+), 52 deletions(-) diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp index d70034d..15d73cb 100644 --- a/src/vidalia/config/BridgeDownloader.cpp +++ b/src/vidalia/config/BridgeDownloader.cpp @@ -16,34 +16,26 @@ #include "BridgeDownloader.h" #include "Vidalia.h" -#include <QSslSocket> - #define BRIDGEDB_HOST "bridges.torproject.org" #define BRIDGEDB_PORT 443 - +#define BRIDGEDB_SHA1 "a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25" BridgeDownloader::BridgeDownloader(QObject *parent) - : QObject(parent), - _requestId(0) + : QObject(parent) { - _https = new QHttp(BRIDGEDB_HOST, QHttp::ConnectionModeHttps, - BRIDGEDB_PORT, this); - - connect(_https, SIGNAL(stateChanged(int)), - this, SLOT(httpsStateChanged(int))); - connect(_https, SIGNAL(requestFinished(int, bool)), - this, SLOT(httpsRequestFinished(int, bool))); - connect(_https, SIGNAL(dataReadProgress(int, int)), - this, SIGNAL(downloadProgress(int, int))); - connect(_https, SIGNAL(sslErrors(QList<QSslError>)), - this, SLOT(sslErrors(QList<QSslError>))); + _https = new QNetworkAccessManager(); + + connect(_https, SIGNAL(finished(QNetworkReply *)), + this, SLOT(httpsRequestFinished(QNetworkReply *))); + connect(_https, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)), + this, SLOT(sslErrors(QNetworkReply *, QList<QSslError>))); } void BridgeDownloader::setProxy(const QString &host, int port, const QString &username, const QString &password) { - _https->setProxy(host, port, username, password); + _https->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port, username, password)); } bool @@ -82,16 +74,18 @@ BridgeDownloader::startHttpsDownload() emit statusChanged(tr("Starting HTTPS bridge request...")); emit downloadProgress(0, 0); - _requestId = _https->get("/?format=plain"); - vInfo("Sending an HTTPS bridge request to %1:%2 (id %3).").arg(BRIDGEDB_HOST) - .arg(BRIDGEDB_PORT) - .arg(_requestId); + _reply = _https->get(QNetworkRequest(QUrl("https://bridges.torproject.org/?format=plain"))); + connect(_reply, SIGNAL(downloadProgress(qint64, qint64)), + this, SIGNAL(downloadProgress(qint64, qint64))); + vInfo("Sending an HTTPS bridge request to %1:%2.").arg(BRIDGEDB_HOST) + .arg(BRIDGEDB_PORT); } void BridgeDownloader::cancelBridgeRequest() { - _https->abort(); + _reply->close(); + disconnect(_reply, 0, 0, 0); } void @@ -117,20 +111,16 @@ BridgeDownloader::httpsStateChanged(int state) } void -BridgeDownloader::httpsRequestFinished(int id, bool error) +BridgeDownloader::httpsRequestFinished(QNetworkReply *reply) { - if (id != _requestId) - return; - - if (error) { - QString errorString = _https->errorString(); - vWarn("Bridge request failed (id %1): %2").arg(id).arg(errorString); + if (reply->error() != QNetworkReply::NoError) { + QString errorString = reply->errorString(); + vWarn("Bridge request failed: %2").arg(errorString); emit bridgeRequestFailed(errorString); } else { - QByteArray response = _https->readAll(); - vInfo("Bridge request complete (id %1): received %2 bytes.").arg(id) - .arg(response.size()); + QByteArray response = reply->readAll(); + vInfo("Bridge request complete: received %2 bytes.").arg(response.size()); QStringList bridges, lines = QString(response).split("\n"); foreach (QString line, lines) { @@ -140,22 +130,27 @@ BridgeDownloader::httpsRequestFinished(int id, bool error) } emit bridgeRequestFinished(bridges); } - _https->close(); + _reply->close(); + disconnect(_reply,0,0,0); } void -BridgeDownloader::sslErrors(const QList<QSslError> &sslErrors) +BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErrors) { QString errorString; QStringList errorStrings; - vWarn("%1 SSL error(s) when requesting bridge information (id %2):") - .arg(sslErrors.size()) - .arg(_requestId); + vWarn("%1 SSL error(s) when requesting bridge information:") + .arg(sslErrors.size()); foreach (QSslError sslError, sslErrors) { errorString = sslError.errorString(); errorStrings << errorString; vWarn(" SSL Error: %1").arg(errorString); } -} + // Check if the certificate is the one we expect + if(_reply->sslConfiguration().peerCertificate().digest(QCryptographicHash::Sha1)==QByteArray::fromHex(BRIDGEDB_SHA1)) { + _reply->ignoreSslErrors(); + } else + vWarn("There's been a problem with the certificate."); +} diff --git a/src/vidalia/config/BridgeDownloader.h b/src/vidalia/config/BridgeDownloader.h index 0cb87f4..cf30979 100644 --- a/src/vidalia/config/BridgeDownloader.h +++ b/src/vidalia/config/BridgeDownloader.h @@ -16,10 +16,7 @@ #ifndef _BRIDGEDOWNLOADER_H #define _BRIDGEDOWNLOADER_H -#include <QHttp> -#include <QSslError> -#include <QStringList> - +#include <QtNetwork> class BridgeDownloader : public QObject { @@ -65,7 +62,7 @@ signals: * have been read so far. Note that total may be 0 if the expected * total size of the response is not known. */ - void downloadProgress(int done, int total); + void downloadProgress(qint64 done, qint64 total); /** Emitted when the status of the bridge request changes. status * describes the new current state of the request. @@ -98,14 +95,14 @@ private slots: * signal is ignored since it is the result of a close() or abort() * request. */ - void httpsRequestFinished(int id, bool error); + void httpsRequestFinished(QNetworkReply *reply); /** Called when the HTTPS connection encounters one or more * sslErrors. Currently the errors are just logged and * bridgeRequestFailed() is not emitted, since QHttp will also * emit */ - void sslErrors(const QList<QSslError> &sslErrors); + void sslErrors(QNetworkReply *, const QList<QSslError> &sslErrors); private: /** Initiates an HTTPS connection to bridges.torproject.org to start @@ -115,10 +112,10 @@ private: /** Used to connect to the bridge database, send an HTTPS request for * new bridge addresses and then read the response. */ - QHttp* _https; + QNetworkAccessManager* _https; - /** Unique numeric identifier of the current bridge request. */ - int _requestId; + /** Identifier of the current bridge request */ + QNetworkReply *_reply; }; #endif diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp index b4d8e28..f16daa8 100644 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp +++ b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp @@ -46,7 +46,7 @@ BridgeDownloaderProgressDialog::setStatus(const QString &status) } void -BridgeDownloaderProgressDialog::setDownloadProgress(int done, int total) +BridgeDownloaderProgressDialog::setDownloadProgress(qint64 done, qint64 total) { ui.progressBar->setRange(0, total); ui.progressBar->setValue(done); diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.h b/src/vidalia/config/BridgeDownloaderProgressDialog.h index 86fb0d3..d9d505f 100644 --- a/src/vidalia/config/BridgeDownloaderProgressDialog.h +++ b/src/vidalia/config/BridgeDownloaderProgressDialog.h @@ -39,7 +39,7 @@ public slots: * maximum steps. If value and maximum are both 0, * then a "busy" progress bar is displayed. */ - void setDownloadProgress(int value, int maximum); + void setDownloadProgress(qint64 value, qint64 maximum); /** Called when the bridge download completes successfully and discards * the progress dialog with an Accept result code. bridges diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index f5bbc72..7154334 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -389,8 +389,8 @@ NetworkPage::findBridges() connect(_bridgeDownloader, SIGNAL(statusChanged(QString)), dlg, SLOT(setStatus(QString))); - connect(_bridgeDownloader, SIGNAL(downloadProgress(int, int)), - dlg, SLOT(setDownloadProgress(int, int))); + connect(_bridgeDownloader, SIGNAL(downloadProgress(qint64, qint64)), + dlg, SLOT(setDownloadProgress(qint64, qint64))); connect(_bridgeDownloader, SIGNAL(bridgeRequestFailed(QString)), dlg, SLOT(bridgeRequestFailed(QString))); connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)),

1 0

[vidalia/master] Handle the validation by adding DigiCert's CAs
by chiiph＠torproject.org 03 May '11

03 May '11

commit 2470c0bda9923a67710fce2ed5fbcc03c3f018f2 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu Apr 28 13:20:46 2011 -0300 Handle the validation by adding DigiCert's CAs --- src/vidalia/Vidalia.cpp | 9 +++++++++ src/vidalia/config/BridgeDownloader.cpp | 7 ------- src/vidalia/res/DigiCertAssuredCA.crt | 22 ++++++++++++++++++++++ src/vidalia/res/DigiCertCA.crt | 22 ++++++++++++++++++++++ src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 +++++++++++++++++++++++ src/vidalia/res/vidalia.qrc | 3 +++ 6 files changed, 79 insertions(+), 7 deletions(-) diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index f88c94f..5c22da3 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -509,5 +509,14 @@ Vidalia::loadDefaultCaCertificates() const if (! QSslSocket::addDefaultCaCertificates(":/pki/EquifaxSecureCA.crt")) vWarn("Failed to add the Equifax Secure CA certificate to the default CA " "certificate database."); + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA.crt")) + vWarn("Failed to add the DigiCert Global CA certificate to the default CA " + "certificate database."); + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA2.crt")) + vWarn("Failed to add the DigiCert Assured CA certificate to the default CA " + "certificate database."); + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA3.crt")) + vWarn("Failed to add the DigiCert High Assurance CA certificate to the default CA " + "certificate database."); } diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp index 15d73cb..f1ac91a 100644 --- a/src/vidalia/config/BridgeDownloader.cpp +++ b/src/vidalia/config/BridgeDownloader.cpp @@ -18,7 +18,6 @@ #define BRIDGEDB_HOST "bridges.torproject.org" #define BRIDGEDB_PORT 443 -#define BRIDGEDB_SHA1 "a7e70f8a648fe04a9677f13eedf6f91b5f7f2e25" BridgeDownloader::BridgeDownloader(QObject *parent) : QObject(parent) @@ -147,10 +146,4 @@ BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErr errorStrings << errorString; vWarn(" SSL Error: %1").arg(errorString); } - - // Check if the certificate is the one we expect - if(_reply->sslConfiguration().peerCertificate().digest(QCryptographicHash::Sha1)==QByteArray::fromHex(BRIDGEDB_SHA1)) { - _reply->ignoreSslErrors(); - } else - vWarn("There's been a problem with the certificate."); } diff --git a/src/vidalia/res/DigiCertAssuredCA.crt b/src/vidalia/res/DigiCertAssuredCA.crt new file mode 100644 index 0000000..2731638 --- /dev/null +++ b/src/vidalia/res/DigiCertAssuredCA.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv +b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG +EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c +JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP +mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+ +wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4 +VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/ +AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB +AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW +BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun +pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC +dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf +fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm +NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx +H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe ++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g== +-----END CERTIFICATE----- diff --git a/src/vidalia/res/DigiCertCA.crt b/src/vidalia/res/DigiCertCA.crt new file mode 100644 index 0000000..fd4341d --- /dev/null +++ b/src/vidalia/res/DigiCertCA.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- diff --git a/src/vidalia/res/DigiCertHighAssuranceCA.crt b/src/vidalia/res/DigiCertHighAssuranceCA.crt new file mode 100644 index 0000000..9e6810a --- /dev/null +++ b/src/vidalia/res/DigiCertHighAssuranceCA.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j +ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL +MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 +LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug +RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm ++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW +PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM +xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB +Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3 +hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg +EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF +MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA +FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec +nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z +eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF +hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2 +Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe +vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep ++OkuE6N36B9K +-----END CERTIFICATE----- diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc index 68f84aa..cfb1004 100644 --- a/src/vidalia/res/vidalia.qrc +++ b/src/vidalia/res/vidalia.qrc @@ -310,6 +310,9 @@ </qresource> <qresource prefix="/pki"> <file>EquifaxSecureCA.crt</file> + <file>DigiCertCA.crt</file> + <file>DigiCertAssuredCA.crt</file> + <file>DigiCertHighAssuranceCA.crt</file> </qresource> <qresource prefix="/geoip"> <file>country-coordinates.csv</file>

1 0

[vidalia/master] Fix paths for the new certificates
by chiiph＠torproject.org 03 May '11

03 May '11

commit 9406862b624f31821711c67e2da6ebca5438abc2 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri Apr 29 14:26:30 2011 -0300 Fix paths for the new certificates --- src/vidalia/Vidalia.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index 5c22da3..91c6dfb 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -512,10 +512,10 @@ Vidalia::loadDefaultCaCertificates() const if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA.crt")) vWarn("Failed to add the DigiCert Global CA certificate to the default CA " "certificate database."); - if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA2.crt")) + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertAssuredCA.crt")) vWarn("Failed to add the DigiCert Assured CA certificate to the default CA " "certificate database."); - if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA3.crt")) + if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertHighAssuranceCA.crt")) vWarn("Failed to add the DigiCert High Assurance CA certificate to the default CA " "certificate database."); }

1 0

[vidalia/master] Merge branch 'bug2835_getbridges'
by chiiph＠torproject.org 03 May '11

03 May '11

commit d92bf67ec79ac110ef833bc4bccd9dede49ad2d6 Merge: 8d691c7 9406862 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 3 11:38:01 2011 -0300 Merge branch 'bug2835_getbridges' src/vidalia/Vidalia.cpp | 9 +++ src/vidalia/config/BridgeDownloader.cpp | 64 ++++++++------------ src/vidalia/config/BridgeDownloader.h | 17 ++--- .../config/BridgeDownloaderProgressDialog.cpp | 2 +- .../config/BridgeDownloaderProgressDialog.h | 2 +- src/vidalia/config/NetworkPage.cpp | 4 +- src/vidalia/res/DigiCertAssuredCA.crt | 22 +++++++ src/vidalia/res/DigiCertCA.crt | 22 +++++++ src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 +++++++ src/vidalia/res/vidalia.qrc | 3 + 10 files changed, 116 insertions(+), 52 deletions(-)

1 0

[vidalia/alpha] Update Vidalia's pot file for the new GUI
by chiiph＠torproject.org 03 May '11

03 May '11

commit 894186662f84f411ec12b40c59d139eac4104f38 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 3 11:31:56 2011 -0300 Update Vidalia's pot file for the new GUI --- src/vidalia/i18n/po/templates/vidalia.pot | 262 +++++++++++++---------------- 1 files changed, 120 insertions(+), 142 deletions(-) diff --git a/src/vidalia/i18n/po/templates/vidalia.pot b/src/vidalia/i18n/po/templates/vidalia.pot index 3070fb0..eb6964e 100644 --- a/src/vidalia/i18n/po/templates/vidalia.pot +++ b/src/vidalia/i18n/po/templates/vidalia.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Vidalia\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" -"POT-Creation-Date: 2011-03-09 13:05+0000\n" +"POT-Creation-Date: 2011-05-03 14:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: \n" "Language-Team: translations(a)vidalia-project.net\n" @@ -223,10 +223,6 @@ msgid "Show Settings" msgstr "" msgctxt "BandwidthGraph" -msgid "Tor Bandwidth Usage" -msgstr "" - -msgctxt "BandwidthGraph" msgid "Reset" msgstr "" @@ -266,6 +262,10 @@ msgctxt "BandwidthGraph" msgid "Cancel" msgstr "" +msgctxt "BandwidthGraph" +msgid "Bandwidth Graph" +msgstr "" + msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." msgstr "" @@ -419,15 +419,21 @@ msgid "Control socket is not connected." msgstr "" msgctxt "ControlPasswordInputDialog" -msgid "Password Required" +msgid "Problem connecting to Tor" msgstr "" msgctxt "ControlPasswordInputDialog" -msgid "Remember my password" +msgid "Tor is already running, but Vidalia can't connect to it.\n" +"\n" +"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." +msgstr "" + +msgctxt "ControlPasswordInputDialog" +msgid "You will need to shut down the Tor process before Vidalia can launch a new one." msgstr "" msgctxt "ControlPasswordInputDialog" -msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:" +msgid "Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process." msgstr "" msgctxt "ControlSocket" @@ -1315,10 +1321,6 @@ msgid "Browse" msgstr "" msgctxt "GeneralPage" -msgid "Start the Tor software when Vidalia starts" -msgstr "" - -msgctxt "GeneralPage" msgid "Tor" msgstr "" @@ -1346,6 +1348,10 @@ msgctxt "GeneralPage" msgid "Check Now" msgstr "" +msgctxt "GeneralPage" +msgid "Connect to Tor automatically" +msgstr "" + msgctxt "GraphFrame" msgid "%1 KB/s" msgstr "" @@ -1623,34 +1629,6 @@ msgid "New Identity" msgstr "" msgctxt "MainWindow" -msgid "Ctrl+T" -msgstr "" - -msgctxt "MainWindow" -msgid "Ctrl+B" -msgstr "" - -msgctxt "MainWindow" -msgid "Ctrl+L" -msgstr "" - -msgctxt "MainWindow" -msgid "Ctrl+N" -msgstr "" - -msgctxt "MainWindow" -msgid "Ctrl+?" -msgstr "" - -msgctxt "MainWindow" -msgid "Ctrl+I" -msgstr "" - -msgctxt "MainWindow" -msgid "Ctrl+P" -msgstr "" - -msgctxt "MainWindow" msgid "Tor" msgstr "" @@ -1659,10 +1637,6 @@ msgid "View" msgstr "" msgctxt "MainWindow" -msgid "Vidalia Help" -msgstr "" - -msgctxt "MainWindow" msgid "Error starting web browser" msgstr "" @@ -1775,10 +1749,6 @@ msgid "Tor is shutting down" msgstr "" msgctxt "MainWindow" -msgid "Stop Tor Now" -msgstr "" - -msgctxt "MainWindow" msgid "Stop Tor" msgstr "" @@ -1855,18 +1825,6 @@ msgid "Vidalia was unable to register for some events. Many of Vidalia's feature msgstr "" msgctxt "MainWindow" -msgid "Authentication Error" -msgstr "" - -msgctxt "MainWindow" -msgid "Vidalia was unable to authenticate to the Tor software. (%1)" -msgstr "" - -msgctxt "MainWindow" -msgid "Please check your control port authentication settings." -msgstr "" - -msgctxt "MainWindow" msgid "Tor Update Available" msgstr "" @@ -1903,127 +1861,111 @@ msgid "Status" msgstr "" msgctxt "MainWindow" -msgid "Vidalia Shortcuts" -msgstr "" - -msgctxt "MainWindow" -msgid "Setup Relaying" -msgstr "" - -msgctxt "MainWindow" -msgid "Set up a relay and help the network grow" -msgstr "" - -msgctxt "MainWindow" -msgid "View the Network" -msgstr "" - -msgctxt "MainWindow" -msgid "View a map of the Tor network" -msgstr "" - -msgctxt "MainWindow" -msgid "Use a New Identity" +msgid "Password Reset Failed" msgstr "" msgctxt "MainWindow" -msgid "Make subsequent connections appear new" +msgid "The currently installed version of Tor is out of date or no longer recommended." msgstr "" msgctxt "MainWindow" -msgid "View recent bandwidth usage" +msgid "Would you like to check if a newer package is available for installation?" msgstr "" msgctxt "MainWindow" -msgid "View log message history" +msgid "Potentially Unsafe Connection" msgstr "" msgctxt "MainWindow" -msgid "View help documentation" +msgid "Tor has automatically closed your connection in order to protect your anonymity." msgstr "" msgctxt "MainWindow" -msgid "Configure Vidalia" +msgid "Update Failed" msgstr "" msgctxt "MainWindow" -msgid "View version and license information" +msgid "Your software is up to date" msgstr "" msgctxt "MainWindow" -msgid "Exit Vidalia" +msgid "There are no new Tor software packages available for your computer at this time." msgstr "" msgctxt "MainWindow" -msgid "Show this window on startup" +msgid "Installation Failed" msgstr "" msgctxt "MainWindow" -msgid "Hide" +msgid "Vidalia was unable to install your software updates." msgstr "" msgctxt "MainWindow" -msgid "Hide this window" +msgid "The following error occurred:" msgstr "" msgctxt "MainWindow" -msgid "Password Reset Failed" +msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2." msgstr "" msgctxt "MainWindow" -msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running." +msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible." msgstr "" msgctxt "MainWindow" -msgid "The currently installed version of Tor is out of date or no longer recommended." +msgid "toolBar" msgstr "" msgctxt "MainWindow" -msgid "Would you like to check if a newer package is available for installation?" +msgid "Start" msgstr "" msgctxt "MainWindow" -msgid "Potentially Unsafe Connection" +msgid "Stop" msgstr "" msgctxt "MainWindow" -msgid "Tor has automatically closed your connection in order to protect your anonymity." +msgid "Restart" msgstr "" msgctxt "MainWindow" -msgid "Update Failed" +msgid "Reload Tor's config" msgstr "" msgctxt "MainWindow" -msgid "Your software is up to date" +msgid "Actions" msgstr "" msgctxt "MainWindow" -msgid "There are no new Tor software packages available for your computer at this time." +msgid "Bootstrapping torrc from %1 to %2" msgstr "" msgctxt "MainWindow" -msgid "Installation Failed" +msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" +"\n" +"Would you like to shutdown gracefully and give clients time to find a new relay?" msgstr "" msgctxt "MainWindow" -msgid "Vidalia was unable to install your software updates." +msgid "Vidalia detected that the Tor software exited unexpectedly.\n" +"\n" +"Please check the message log for recent warning or error messages." msgstr "" msgctxt "MainWindow" -msgid "The following error occurred:" +msgid "Vidalia tried to restart Tor, but was not able to. Please check your Task Manager to ensure there are no other Tor processes running." msgstr "" msgctxt "MainWindow" -msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2." +msgid "failed (%1)" msgstr "" msgctxt "MainWindow" -msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible." +msgid ", probably Telnet," msgstr "" msgctxt "MainWindow" -msgid "failed (%1)" +msgid ", probably an email client," msgstr "" msgctxt "MainWindow" @@ -2032,23 +1974,11 @@ msgid "Your relay is shutting down.\n" msgstr "" msgctxt "MainWindow" -msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" -"\n" -"Would you like to shutdown gracefully and give clients time to find a new relay?" +msgid "Error reloading configuration" msgstr "" msgctxt "MainWindow" -msgid "Vidalia detected that the Tor software exited unexpectedly.\n" -"\n" -"Please check the message log for recent warning or error messages." -msgstr "" - -msgctxt "MainWindow" -msgid ", probably Telnet," -msgstr "" - -msgctxt "MainWindow" -msgid ", probably an email client," +msgid "Vidalia was unable to reload Tor's configuration." msgstr "" msgctxt "MessageLog" @@ -2304,19 +2234,11 @@ msgid "Automatically save new log messages to a file" msgstr "" msgctxt "MessageLog" -msgid "Basic" -msgstr "" - -msgctxt "MessageLog" -msgid "Tor Status" -msgstr "" - -msgctxt "MessageLog" -msgid "Advanced" +msgid "Always Save New Log Messages" msgstr "" msgctxt "MessageLog" -msgid "Always Save New Log Messages" +msgid "toolbar" msgstr "" msgctxt "MessageLog" @@ -2353,10 +2275,6 @@ msgid "Cannot write file %1\n" msgstr "" msgctxt "NetViewer" -msgid "Tor Network Map" -msgstr "" - -msgctxt "NetViewer" msgid "Refresh" msgstr "" @@ -2456,6 +2374,22 @@ msgctxt "NetViewer" msgid "Ctrl+F" msgstr "" +msgctxt "NetViewer" +msgid "Network Map" +msgstr "" + +msgctxt "NetViewer" +msgid "Relay" +msgstr "" + +msgctxt "NetViewer" +msgid "Connection" +msgstr "" + +msgctxt "NetViewer" +msgid "Status" +msgstr "" + msgctxt "NetworkPage" msgid "Invalid Bridge" msgstr "" @@ -2769,10 +2703,6 @@ msgid "Run as a client only" msgstr "" msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr "" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "" @@ -3005,6 +2935,14 @@ msgid "Automatically distribute my bridge address" msgstr "" msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "" + +msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "" @@ -3046,10 +2984,6 @@ msgid "Directory already in use by another service." msgstr "" msgctxt "ServicePage" -msgid "Form" -msgstr "" - -msgctxt "ServicePage" msgid "Provided Hidden Services" msgstr "" @@ -3269,6 +3203,22 @@ msgctxt "StatusEventWidget" msgid "Your relay is now online and available for Tor clients to use. You should see an increase in network traffic shown by the Bandwidth Graph within a few hours as more clients learn about your relay. Thank you for contributing to the Tor network!" msgstr "" +msgctxt "StatusTab" +msgid "Status" +msgstr "" + +msgctxt "StatusTab" +msgid "Message Log" +msgstr "" + +msgctxt "StatusTab" +msgid "Tor Status" +msgstr "" + +msgctxt "StatusTab" +msgid "Show on startup" +msgstr "" + msgctxt "Stream" msgid "New" msgstr "" @@ -3305,6 +3255,10 @@ msgctxt "Stream" msgid "Unknown" msgstr "" +msgctxt "TorControl" +msgid "Vidalia has not started Tor. You need to stop Tor through the interface you started it." +msgstr "" + msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" msgstr "" @@ -3381,6 +3335,30 @@ msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" msgstr "" +msgctxt "TorrcDialog" +msgid "Ctrl+X" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Ctrl+C" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Ctrl+V" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Ctrl+Z" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Ctrl+Shift+Z" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Ctrl+A" +msgstr "" + msgctxt "UPNPControl" msgid "Success" msgstr ""

1 0