- tor-commits - lists.torproject.org

[vidalia/alpha] Remove the certs since we don't need them anymore
by chiiph＠torproject.org 31 May '12

31 May '12

commit 09a38ff4d6e09111bc513e1dd32ad8532487cf7e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Wed May 30 20:12:00 2012 -0300 Remove the certs since we don't need them anymore --- src/vidalia/res/DigiCertAssuredCA.crt | 22 ---------------------- src/vidalia/res/DigiCertCA.crt | 22 ---------------------- src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 ----------------------- src/vidalia/res/EquifaxSecureCA.crt | 19 ------------------- src/vidalia/res/vidalia.qrc | 6 ------ 5 files changed, 0 insertions(+), 92 deletions(-) diff --git a/src/vidalia/res/DigiCertAssuredCA.crt b/src/vidalia/res/DigiCertAssuredCA.crt deleted file mode 100644 index 2731638..0000000 --- a/src/vidalia/res/DigiCertAssuredCA.crt +++ /dev/null @@ -1,22 +0,0 @@ ------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 deleted file mode 100644 index fd4341d..0000000 --- a/src/vidalia/res/DigiCertCA.crt +++ /dev/null @@ -1,22 +0,0 @@ ------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 deleted file mode 100644 index 9e6810a..0000000 --- a/src/vidalia/res/DigiCertHighAssuranceCA.crt +++ /dev/null @@ -1,23 +0,0 @@ ------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/EquifaxSecureCA.crt b/src/vidalia/res/EquifaxSecureCA.crt deleted file mode 100644 index ed0bd76..0000000 --- a/src/vidalia/res/EquifaxSecureCA.crt +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV -UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy -dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1 -MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx -dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B -AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f -BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A -cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC -AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ -MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm -aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw -ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj -IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF -MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA -A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y -7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh -1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4 ------END CERTIFICATE----- diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc index aa5cfe1..c1c52c7 100644 --- a/src/vidalia/res/vidalia.qrc +++ b/src/vidalia/res/vidalia.qrc @@ -309,12 +309,6 @@ <qresource prefix="/images"> <file>map/world-map.png</file> </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> </qresource>

1 0

[vidalia/alpha] Link with ws2_32.lib and zlib on Windows with -static
by chiiph＠torproject.org 31 May '12

31 May '12

commit ef000df479d7a9800a9c1fa92bb1350d95f23606 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 17 15:43:18 2012 +0200 Link with ws2_32.lib and zlib on Windows with -static The build system doesn't figure out how to correctly set the library dependencies, so let's give it a little help. --- changes/win_static_ws32 | 4 ++++ src/common/CMakeLists.txt | 5 ++++- src/tools/po2nsh/CMakeLists.txt | 4 ++++ src/tools/po2ts/CMakeLists.txt | 4 ++++ src/tools/po2wxl/CMakeLists.txt | 4 ++++ src/tools/ts2po/CMakeLists.txt | 4 ++++ src/tools/wixtool/CMakeLists.txt | 4 ++++ 7 files changed, 28 insertions(+), 1 deletions(-) diff --git a/changes/win_static_ws32 b/changes/win_static_ws32 new file mode 100644 index 0000000..5cb5067 --- /dev/null +++ b/changes/win_static_ws32 @@ -0,0 +1,4 @@ + o Build fixes: + - For static builds on windows, correctly link with zlib and + ws32_2.lib. + diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 92ec489..1404b1b 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -31,10 +31,13 @@ if(WIN32) ) endif(WIN32) - add_library(common STATIC ${common_SRCS}) target_link_libraries(common ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) +if (WIN32 AND QT_CONFIG MATCHES "static") + target_link_libraries(common z) +endif(WIN32 AND QT_CONFIG MATCHES "static") + diff --git a/src/tools/po2nsh/CMakeLists.txt b/src/tools/po2nsh/CMakeLists.txt index 45b291f..ebe027a 100644 --- a/src/tools/po2nsh/CMakeLists.txt +++ b/src/tools/po2nsh/CMakeLists.txt @@ -23,6 +23,10 @@ target_link_libraries(po2nsh ${QT_QTCORE_LIBRARY} ) +if (WIN32 AND QT_CONFIG MATCHES "static") + target_link_libraries(po2nsh ws2_32 z) +endif(WIN32 AND QT_CONFIG MATCHES "static") + ## Remember the location of po2nsh so we can use it in custom commands get_target_property(PO2NSH_EXECUTABLE po2nsh LOCATION) set(VIDALIA_PO2NSH_EXECUTABLE ${PO2NSH_EXECUTABLE} diff --git a/src/tools/po2ts/CMakeLists.txt b/src/tools/po2ts/CMakeLists.txt index fff76bc..87d1f1b 100644 --- a/src/tools/po2ts/CMakeLists.txt +++ b/src/tools/po2ts/CMakeLists.txt @@ -25,6 +25,10 @@ target_link_libraries(po2ts ${QT_QTXML_LIBRARY} ) +if (WIN32 AND QT_CONFIG MATCHES "static") + target_link_libraries(po2ts z) +endif(WIN32 AND QT_CONFIG MATCHES "static") + ## Remember the location of po2ts so we can use it in custom commands get_target_property(PO2TS_EXECUTABLE po2ts LOCATION) set(VIDALIA_PO2TS_EXECUTABLE ${PO2TS_EXECUTABLE} diff --git a/src/tools/po2wxl/CMakeLists.txt b/src/tools/po2wxl/CMakeLists.txt index 5e8e547..94bf40e 100644 --- a/src/tools/po2wxl/CMakeLists.txt +++ b/src/tools/po2wxl/CMakeLists.txt @@ -24,6 +24,10 @@ target_link_libraries(po2wxl ${QT_QTXML_LIBRARY} ) +if (WIN32 AND QT_CONFIG MATCHES "static") + target_link_libraries(po2wxl ws2_32 z) +endif(WIN32 AND QT_CONFIG MATCHES "static") + ## Remember the location of po2wxl so we can use it in custom commands get_target_property(PO2WXL_EXECUTABLE po2wxl LOCATION) set(VIDALIA_PO2WXL_EXECUTABLE ${PO2WXL_EXECUTABLE} diff --git a/src/tools/ts2po/CMakeLists.txt b/src/tools/ts2po/CMakeLists.txt index b98725c..d826e2e 100644 --- a/src/tools/ts2po/CMakeLists.txt +++ b/src/tools/ts2po/CMakeLists.txt @@ -46,6 +46,10 @@ target_link_libraries(ts2po ${QT_QTXML_LIBRARY} ) +if (WIN32 AND QT_CONFIG MATCHES "static") + target_link_libraries(ts2po z) +endif(WIN32 AND QT_CONFIG MATCHES "static") + ## Remember the location of ts2po so we can use it in custom commands get_target_property(TS2PO_EXECUTABLE ts2po LOCATION) set(VIDALIA_TS2PO_EXECUTABLE ${TS2PO_EXECUTABLE} diff --git a/src/tools/wixtool/CMakeLists.txt b/src/tools/wixtool/CMakeLists.txt index f205a46..349bc7a 100644 --- a/src/tools/wixtool/CMakeLists.txt +++ b/src/tools/wixtool/CMakeLists.txt @@ -20,6 +20,10 @@ target_link_libraries(wixtool ${QT_QTXML_LIBRARY} ) +if (WIN32 AND QT_CONFIG MATCHES "static") + target_link_libraries(wixtool ws2_32 z) +endif(WIN32 AND QT_CONFIG MATCHES "static") + ## Remember location so we can use it in custom commands get_target_property(WIXTOOL_EXECUTABLE wixtool LOCATION) set(VIDALIA_WIXTOOL_EXECUTABLE ${WIXTOOL_EXECUTABLE}

1 0

[vidalia/alpha] Really get rid of the openssl dependency
by chiiph＠torproject.org 31 May '12

31 May '12

commit 3c0c5ced208a6dcc09946b235fe39accdb721128 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 17 16:05:08 2012 +0200 Really get rid of the openssl dependency --- CMakeLists.txt | 3 - INSTALL | 5 -- LICENSE | 36 ----------- LICENSE-OPENSSL | 127 --------------------------------------- changes/openssl_dep | 4 + cmake/FindOpenSSL.cmake | 116 ----------------------------------- pkg/osx/CMakeLists.txt | 2 - pkg/win32/CMakeLists.txt | 6 -- pkg/win32/bridge-bundle.nsi.in | 3 - pkg/win32/vidalia-bundle.nsi.in | 3 - pkg/win32/vidalia.wxs.in | 12 ---- src/vidalia/Vidalia.cpp | 24 ------- src/vidalia/Vidalia.h | 5 -- src/vidalia/res/license.html | 46 -------------- 14 files changed, 4 insertions(+), 388 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8ea862..c9a2405 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,9 +52,6 @@ include(CheckFunctionExists) if (WIN32) include(${CMAKE_SOURCE_DIR}/cmake/FindWiX.cmake) endif(WIN32) -if (MSVC) - include(${CMAKE_SOURCE_DIR}/cmake/FindOpenSSL.cmake) -endif(MSVC) if(MSVC_IDE) set(CMAKE_SUPPRESS_REGENERATION TRUE) diff --git a/INSTALL b/INSTALL index cf01d96..c35c17e 100644 --- a/INSTALL +++ b/INSTALL @@ -210,11 +210,6 @@ the command line and follows the format "-D <var>:<type>=<value> Specifies the location of Qt's 'qmake' binary. - -DOPENSSL_LIBRARY_DIR=/path/to/openssl - - Specifies the location of OpenSSL's libraries for building installer on - Windows. - -DCMAKE_INSTALL_PREFIX=/usr/local Specifies the install prefix used for `make install`. diff --git a/LICENSE b/LICENSE index 22bd2f9..d91eb68 100644 --- a/LICENSE +++ b/LICENSE @@ -11,9 +11,6 @@ your option) any later version. The full text of versions 2 and 3 of the GPL can be found respectively in the files LICENSE-GPLV2 and LICENSE-GPLV3. -EXCEPTION: This distribution of Vidalia may be linked against OpenSSL -according to the terms of the section below entitled "OpenSSL Exception." - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General @@ -23,39 +20,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - _OpenSSL Exception_ - -0. Definitions - -"Vidalia" means Vidalia software licensed under version 2 or any later -version of the GNU General Public License (collectively, "GPL"), or a -work based on such software and licensed under the GPL. - -"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -Project and licensed under the OpenSSL Licenses, or a work based on such -software and licensed under the OpenSSL Licenses. - -"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -under which the OpenSSL Project distributes the OpenSSL toolkit software, -as those licenses appear in the file LICENSE-OPENSSL. - -1. Exception - -You have permission to copy, modify, propagate, and distribute a work -formed by combining OpenSSL with Vidalia, or a work derivative of such a -combination, even if such copying, modification, propagation, or -distribution would otherwise violate the terms of the GPL. You must -comply with the GPL in all respects for all of the code used other than -OpenSSL. - -You may include this OpenSSL Exception and its grant of permissions when -you distribute Vidalia. Inclusion of this notice with such a -distribution constitutes a grant of such permission. If you do not wish -to grant these permissions, remove this section entitled "OpenSSL -Exception" from your distribution. - - =================================================================== Vidalia incorporates icons from KDE's Oxygen icon theme. It is diff --git a/LICENSE-OPENSSL b/LICENSE-OPENSSL deleted file mode 100644 index ff99d97..0000000 --- a/LICENSE-OPENSSL +++ /dev/null @@ -1,127 +0,0 @@ - - LICENSE ISSUES - ============== - - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of - the OpenSSL License and the original SSLeay license apply to the toolkit. - See below for the actual license texts. Actually both licenses are BSD-style - Open Source licenses. In case of any license issues related to OpenSSL - please contact openssl-core(a)openssl.org. - - OpenSSL License - --------------- - -/* ==================================================================== - * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core(a)openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay(a)cryptsoft.com) This product includes software written by Tim - * Hudson (tjh(a)cryptsoft.com) - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay(a)cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay(a)cryptsoft.com) - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh(a)cryptsoft.com) - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay(a)cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh(a)cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - diff --git a/changes/openssl_dep b/changes/openssl_dep new file mode 100644 index 0000000..dc27cd1 --- /dev/null +++ b/changes/openssl_dep @@ -0,0 +1,4 @@ + o Code simplifications and refactoring: + - Really get rid of the openssl dependency. The goal had been to achieve + that for 0.2.18, but not everything was actually removed. + diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake deleted file mode 100644 index 0f931b0..0000000 --- a/cmake/FindOpenSSL.cmake +++ /dev/null @@ -1,116 +0,0 @@ -## -## $Id$ -## -## This file is part of Vidalia, and is subject to the license terms in the -## LICENSE file, found in the top level directory of this distribution. If -## you did not receive the LICENSE file with this file, you may obtain it -## from the Vidalia source package distributed by the Vidalia Project at -## http://www.torproject.org/projects/vidalia.html. No part of Vidalia, -## including this file, may be copied, modified, propagated, or distributed -## except according to the terms described in the LICENSE file. -## -## This file incorporates work covered by the following copyright and -## permission notice: -## -## Copyright (c) 2006, Alexander Neundorf, <neundorf(a)kde.org> -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are met: -## -## * Redistributions of source code must retain the above copyright notice, -## this list of conditions and the following disclaimer. -## -## * Redistributions in binary form must reproduce the above copyright notice, -## this list of conditions and the following disclaimer in the documentation -## and/or other materials provided with the distribution. -## -## * Neither the names of the copyright owners nor the names of its -## contributors may be used to endorse or promote products derived from this -## software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -## ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -## CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -## SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -## INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -## CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -## POSSIBILITY OF SUCH DAMAGE. -## - -## Tries to find the required OpenSSL libraries. Once done this will define -## the variable OPENSSL_LIBRARIES. - -message(STATUS "Looking for OpenSSL libraries") -if (MSVC) - # /MD and /MDd are the standard values - if somone wants to use - # others, the libnames have to change here too - # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b - - find_library(OPENSSL_LIBSSL_DEBUG - NAMES ssleay32MDd ssl ssleay32 - PATHS ${OPENSSL_LIBRARY_DIR} - ) - find_library(OPENSSL_LIBSSL_RELEASE - NAMES ssleay32MD ssl ssleay32 - PATHS ${OPENSSL_LIBRARY_DIR} - ) - find_library(OPENSSL_LIBCRYPTO_DEBUG - NAMES libeay32MDd crypto libeay32 - PATHS ${OPENSSL_LIBRARY_DIR} - ) - find_library(OPENSSL_LIBCRYPTO_RELEASE - NAMES libeay32MD crypto libeay32 - PATHS ${OPENSSL_LIBRARY_DIR} - ) - - if (MSVC_IDE) - if (NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE) - message(FATAL_ERROR - "Could not find the debug and release version of libssl.") - endif(NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE) - if (NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE) - message(FATAL_ERROR - "Could not find the debug and release version of libcrypto.") - endif(NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE) - - set(OPENSSL_LIBSSL - optimized ${OPENSSL_LIBSSL_RELEASE} - debug ${OPENSSL_LIBSSL_DEBUG}) - set(OPENSSL_LIBCRYPTO - optimized ${OPENSSL_LIBCRYPTO_RELEASE} - debug ${OPENSSL_LIBCRYPTO_DEBUG}) - else(MSVC_IDE) - string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_DEBUG}) - set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_DEBUG}) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_RELEASE}) - set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_RELEASE}) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - endif(MSVC_IDE) - mark_as_advanced(OPENSSL_LIBSSL_DEBUG OPENSSL_LIBCRYPTO_DEBUG - OPENSSL_LIBSSL_RELEASE OPENSSL_LIBCRYPTO_RELEASE) -else(MSVC) - find_library(OPENSSL_LIBSSL NAMES ssl ssleay32) - find_library(OPENSSL_LIBCRYPTO NAMES crypto libeay32) -endif(MSVC) - - -if (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO) - set(OPENSSL_LIBRARIES ${OPENSSL_LIBSSL} ${OPENSSL_LIBCRYPTO}) - mark_as_advanced(OPENSSL_LIBSSL OPENSSL_LIBCRYPTO) - mark_as_advanced(OPENSSL_LIBRARIES) - message(STATUS "Looking for OpenSSL libraries - found") -else (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO) - if (NOT OPENSSL_LIBSSL) - message(FATAL_ERROR "Could not find libssl.") - else (NOT OPENSSL_LIBSSL) - message(FATAL_ERROR "Could not find libcrypto.") - endif (NOT OPENSSL_LIBSSL) -endif(OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO) - diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt index eca7049..c44a47c 100644 --- a/pkg/osx/CMakeLists.txt +++ b/pkg/osx/CMakeLists.txt @@ -65,7 +65,6 @@ add_custom_target(dist-osx --copy ${Vidalia_SOURCE_DIR}/LICENSE:/Licenses/License.txt --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV2:/Licenses/License-GPLv2.txt --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV3:/Licenses/License-GPLv3.txt - --copy ${Vidalia_SOURCE_DIR}/LICENSE-OPENSSL:/Licenses/License-OpenSSL.txt --copy ${Vidalia_SOURCE_DIR}/README:/ReadMe.txt --copy ${Vidalia_SOURCE_DIR}/CHANGELOG:/Changes.txt COMMENT "Creating vidalia-${VERSION}-${DMG_ARCH}.dmg" @@ -102,7 +101,6 @@ if (TOR_SOURCE_DIR AND SCRIPT_DIR) --copy ${Vidalia_SOURCE_DIR}/LICENSE:/Licenses/License.txt --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV2:/Licenses/License-GPLv2.txt --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV3:/Licenses/License-GPLv3.txt - --copy ${Vidalia_SOURCE_DIR}/LICENSE-OPENSSL:/Licenses/License-OpenSSL.txt --copy ${Vidalia_SOURCE_DIR}/CHANGELOG:/Changes.txt --copy ${TOR_SOURCE_DIR}/src/or/tor:/Vidalia.app/Contents/MacOS/ --copy ${TOR_SOURCE_DIR}/src/tools/tor-checkkey:/Vidalia.app/Contents/MacOS/ diff --git a/pkg/win32/CMakeLists.txt b/pkg/win32/CMakeLists.txt index 13306e7..c7cbe05 100644 --- a/pkg/win32/CMakeLists.txt +++ b/pkg/win32/CMakeLists.txt @@ -16,12 +16,6 @@ if (MINGW) endif(NOT MINGW_BINARY_DIR) endif(MINGW) -if (USE_QSSLSOCKET) - if (NOT OPENSSL_BINARY_DIR) - set(OPENSSL_BINARY_DIR ${Vidalia_BINARY_DIR}/bin) - endif(NOT OPENSSL_BINARY_DIR) -endif(USE_QSSLSOCKET) - ## Only configure the bundle installer if paths to Tor, Polipo, and ## Torbutton are specified set(CONFIGURE_BUNDLE_NSI TRUE) diff --git a/pkg/win32/bridge-bundle.nsi.in b/pkg/win32/bridge-bundle.nsi.in index 37eb4a8..00a288d 100644 --- a/pkg/win32/bridge-bundle.nsi.in +++ b/pkg/win32/bridge-bundle.nsi.in @@ -163,15 +163,12 @@ SectionGroup "${VIDALIA_DESC}" VidaliaGroup File "@QT_BINARY_DIR@\QtXml4.dll" File "@QT_BINARY_DIR@\libgcc_s_dw2-1.dll" File "@MINGW_BINARY_DIR@\mingwm10.dll" - File "@OPENSSL_BINARY_DIR@\ssleay32.dll" - File "@OPENSSL_BINARY_DIR@\libeay32.dll" File "@Vidalia_SOURCE_DIR@\README" File "@Vidalia_SOURCE_DIR@\CHANGELOG" File "@Vidalia_SOURCE_DIR@\LICENSE" File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV2" File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV3" File "@Vidalia_SOURCE_DIR@\LICENSE-LGPLV3" - File "@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" File "@Vidalia_SOURCE_DIR@\CREDITS" ; Include a prebuilt GeoIP cache diff --git a/pkg/win32/vidalia-bundle.nsi.in b/pkg/win32/vidalia-bundle.nsi.in index fc9b30e..b5a3841 100644 --- a/pkg/win32/vidalia-bundle.nsi.in +++ b/pkg/win32/vidalia-bundle.nsi.in @@ -163,15 +163,12 @@ SectionGroup "${VIDALIA_DESC}" VidaliaGroup File "@QT_BINARY_DIR@\QtXml4.dll" File "@QT_BINARY_DIR@\libgcc_s_dw2-1.dll" File "@MINGW_BINARY_DIR@\mingwm10.dll" - File "@OPENSSL_BINARY_DIR@\ssleay32.dll" - File "@OPENSSL_BINARY_DIR@\libeay32.dll" File "@Vidalia_SOURCE_DIR@\README" File "@Vidalia_SOURCE_DIR@\CHANGELOG" File "@Vidalia_SOURCE_DIR@\LICENSE" File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV2" File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV3" File "@Vidalia_SOURCE_DIR@\LICENSE-LGPLV3" - File "@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" File "@Vidalia_SOURCE_DIR@\CREDITS" ; Include a prebuilt GeoIP cache diff --git a/pkg/win32/vidalia.wxs.in b/pkg/win32/vidalia.wxs.in index 91c6341..47efec4 100644 --- a/pkg/win32/vidalia.wxs.in +++ b/pkg/win32/vidalia.wxs.in @@ -11,7 +11,6 @@ <?define QtLibraryGuid="420D52CF-D7C0-4BA0-9D4E-A229E6CFAE9D" ?> <?define QtImageFormatPluginsGuid="420D52CF-D7C0-4BA0-9D4E-A229E6CFAE9D" ?> <?define MinGWLibraryGuid="B4925AB4-DEF4-4B1E-88A7-67EACD8F1312" ?> - <?define OpenSSLLibraryGuid="F93379CC-F2E8-4476-BCBC-D57FEA0E5320" ?> <?define MarbleWidgetLibraryGuid="8D749190-ADD6-40EA-A59F-3331EDAEDE01" ?> <?define MarblePluginsGuid="D323FF55-CD5F-4EF1-BAE1-1D8A4B79E112" ?> <?define MarbleLegendsDataGuid="46903134-8E51-4D06-9ABB-92A6E1F439BE" ?> @@ -99,8 +98,6 @@ Name="LICENSE-GPLV3" Source="@Vidalia_SOURCE_DIR@\LICENSE-GPLV3" /> <File Id="VidaliaLicenseLgplV3" DiskId="1" Name="LICENSE-LGPLV3" Source="@Vidalia_SOURCE_DIR@\LICENSE-LGPLV3" /> - <File Id="VidaliaLicenseOpenSSL" DiskId="1" - Name="LICENSE-OPENSSL" Source="@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" /> </Component>  @@ -123,14 +120,6 @@ <?endif?> </Component> -  - <Component Id="OpenSSLLibrary" Guid="$(var.OpenSSLLibraryGuid)"> - <File Id="ssleay32dll" DiskId="1" - Name="ssleay32.dll" Source="@OPENSSL_BINARY_DIR@\ssleay32.dll" /> - <File Id="libeay32dll" DiskId="1" - Name="libeay32.dll" Source="@OPENSSL_BINARY_DIR@\libeay32.dll" /> - </Component> - <?if $(var.UseBreakpad) = "ON"?>  <Merge Id="CRT" Language="0" DiskId="1" @@ -319,7 +308,6 @@ <ComponentRef Id="VidaliaExecutable" /> <ComponentRef Id="VidaliaDocuments" /> <ComponentRef Id="QtLibrary" /> - <ComponentRef Id="OpenSSLLibrary" /> <?if $(var.UseMarble) = "ON"?> <ComponentRef Id="QtImageFormatPlugins" /> <ComponentRef Id="MarbleWidgetLibrary" /> diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp index f59705f..325aa72 100644 --- a/src/vidalia/Vidalia.cpp +++ b/src/vidalia/Vidalia.cpp @@ -32,7 +32,6 @@ #include <QShortcut> #include <QTranslator> #include <QLibraryInfo> -#include <QSslSocket> #ifdef Q_OS_MACX #include <Carbon/Carbon.h> @@ -132,10 +131,6 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv) /* Creates a Torrc handler */ _torrc = new Torrc(settings.getTorrc(), settings.getDefaultsTorrc()); - /* If we were built with QSslSocket support, then populate the default - * CA certificate store. */ - loadDefaultCaCertificates(); - #ifdef USE_MARBLE /* Tell Marble where to stash its generated data */ Marble::MarbleDirs::setMarbleDataPath(dataDirectory()); @@ -523,22 +518,3 @@ Vidalia::copyDefaultSettingsFile() const #endif } -void -Vidalia::loadDefaultCaCertificates() const -{ - QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>()); - - 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/DigiCertAssuredCA.crt")) - vWarn("Failed to add the DigiCert Assured CA certificate to the default CA " - "certificate database."); - if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertHighAssuranceCA.crt")) - vWarn("Failed to add the DigiCert High Assurance CA certificate to the default CA " - "certificate database."); -} - diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h index 98a7341..c5224e0 100644 --- a/src/vidalia/Vidalia.h +++ b/src/vidalia/Vidalia.h @@ -151,11 +151,6 @@ private: */ void copyDefaultSettingsFile() const; - /** Clears the list of default CA certificates and adds only the ones - * Vidalia is interested in. - */ - void loadDefaultCaCertificates() const; - static QMap<QString, QString> _args; /**< List of command-line arguments. */ static QString _style; /**< The current GUI style. */ static QString _language; /**< The current language. */ diff --git a/src/vidalia/res/license.html b/src/vidalia/res/license.html index ef6c365..b4abcb9 100644 --- a/src/vidalia/res/license.html +++ b/src/vidalia/res/license.html @@ -18,11 +18,6 @@ LICENSE-GPLV3. -EXCEPTION: This distribution of Vidalia may be linked against OpenSSL -according to the terms of the section below entitled "OpenSSL Exception." - - - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General @@ -35,47 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -OpenSSL Exception - - -0. Definitions - - -"Vidalia" means Vidalia software licensed under version 2 or any later -version of the GNU General Public License (collectively, "GPL"), or a -work based on such software and licensed under the GPL. - - -"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL -Project and licensed under the OpenSSL Licenses, or a work based on such -software and licensed under the OpenSSL Licenses. - - -"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License -under which the OpenSSL Project distributes the OpenSSL toolkit software, -as those licenses appear in the file LICENSE-OPENSSL. - - -1. Exception - - -You have permission to copy, modify, propagate, and distribute a work -formed by combining OpenSSL with Vidalia, or a work derivative of such a -combination, even if such copying, modification, propagation, or -distribution would otherwise violate the terms of the GPL. You must -comply with the GPL in all respects for all of the code used other than -OpenSSL. - - - -You may include this OpenSSL Exception and its grant of permissions when -you distribute Vidalia. Inclusion of this notice with such a -distribution constitutes a grant of such permission. If you do not wish -to grant these permissions, remove this section entitled "OpenSSL -Exception" from your distribution. - - <hr> <h3>KDE Oxygen Icon Theme</h3>

1 0

[torbutton/master] Alter makexpi.sh version extraction.
by mikeperry＠torproject.org 31 May '12

31 May '12

commit 7ed2435f876b4c418479c22fc3565ab222ae766a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed May 30 18:16:48 2012 -0700 Alter makexpi.sh version extraction. --- makexpi.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index d8b8358..42479c3 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -1,6 +1,6 @@ #!/bin/bash APP_NAME=torbutton -VERSION=`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3` +VERSION=`grep em:version src/install.rdf | sed -e 's/["]//g' | cut -f2 -d=` XPI_NAME=$APP_NAME-$VERSION.xpi if [ -e "pkg/$XPI_NAME" ]; then

1 0

[torbutton/master] Bug 3838: More agressively warn users that Torbutton is enabled.
by mikeperry＠torproject.org 31 May '12

31 May '12

commit b299743d664e8719c28abd6204deedf6ca189f50 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed May 30 18:15:19 2012 -0700 Bug 3838: More agressively warn users that Torbutton is enabled. Thanks proper, for keeping us proper. Also, include some language improvements from nickm. --- src/chrome/content/torbutton.js | 14 ++++++++++---- src/chrome/locale/en/torbutton.properties | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 57aaef8..f80b5a2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -633,10 +633,9 @@ function torbutton_inform_about_tbb() { var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_OK; - var strings = torbutton_get_stringbundle(); var message = strings.GetStringFromName("torbutton.popup.prompt_torbrowser"); + var title = strings.GetStringFromName("torbutton.title.prompt_torbrowser"); var checkbox = {value: false}; var sb = Components.classes["@mozilla.org/intl/stringbundle;1"] @@ -645,8 +644,7 @@ function torbutton_inform_about_tbb() { var askagain = browserstrings.GetStringFromName("privateBrowsingNeverAsk"); - var response = prompts.confirmEx(null, "", message, flags, null, null, null, - askagain, checkbox); + var response = prompts.alertCheck(null, title, message, askagain, checkbox); // Update preferences to reflect their response and to prevent the prompt from // being displayed again. @@ -4056,6 +4054,14 @@ function torbutton_do_startup() m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); } + if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { + var o_stringbundle = torbutton_get_stringbundle(); + var warning = o_stringbundle.GetStringFromName("torbutton.popup.short_torbrowser"); + var title = o_stringbundle.GetStringFromName("torbutton.title.prompt_torbrowser"); + var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService); + prompts.alert(null, title, warning); + } + m_tb_prefs.setBoolPref("extensions.torbutton.startup", false); } } diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index aa0167c..8679003 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -40,4 +40,6 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. -torbutton.popup.prompt_torbrowser = Torbutton is no longer safe to use in a browser that is also used for non-Tor browsing. We have disabled the ability to toggle Torbutton as a result.\n\nIf you wish to keep using Firefox for non-Tor browsing, you should uninstall Torbutton and download Tor Browser. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton. +torbutton.title.prompt_torbrowser = Important Torbutton Information +torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 31 May '12

31 May '12

commit 03848074aaa1c412a30a4c266997fa429f987352 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 31 01:15:09 2012 +0000 Update translations for tsum_completed --- de/short-user-manual_de_noimg.xhtml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/de/short-user-manual_de_noimg.xhtml b/de/short-user-manual_de_noimg.xhtml index 0c39202..9216850 100644 --- a/de/short-user-manual_de_noimg.xhtml +++ b/de/short-user-manual_de_noimg.xhtml @@ -22,12 +22,12 @@ Nachtrag: Das Tor Browser Bundle für Linux und Mac OS X sind große Datein die Sie mit Mail Accounts von Gmail, Hotmail oder Yahoo nicht empfangen können. Sollte dies bei Ihnen der Fall sein dann wenden Sie sich bitte an help(a)rt.torproject.org, wir werden Ihenen dann eine Liste mit Mirror Servern zukommen lassen wo Sie die Software herunterladen können. <h3 id="tor-for-smartphones">Tor für Smartphones</h3> Sie können Tor auf Ihrem Android Gerät installieren. Sie benötigen dafür das Paket Orbot. Informationen zum Download und zur Installation erhalten Sie auf der <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>. - Es gibt eine experimentelle Software für <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> und <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. + Wir haben auch experimentelle Pakete für <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> und <a href="http://sid77.slackware.it/ios/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">Wie kann ich sicherstellen das ich die richtige Version habe?</h3> Bevor Säie das Tor Browser Bundle verwenden stellen Sie bitte sicher das Sie die richtige Version benutzen. Die Software, die du erhältst kommt mit einer Datei, die den selben Namen hat, wie das das Bundle und einer .asc Dateiendung. Diese .asc-Datei ist eine GPG-Signatur und erlaubt es dir sicherzustellen, dass die Datei die du geladen hast genau die ist die wir dir auch zukommen lassen wollten. Bevor du die Signatur überprüfen können, musst du GnuPG herunterladen und installieren: - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Die meisten Linux-Distributionen haben GnuPG vorinstalliert. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: Die meisten Linux Versionen kommen mit vorinstalliertem GnuPG. Bitte beachte, dass die folgenden Pfade und Befehle geändert werden müssen, damit es auf deinem System funktioniert. Erinn Clark signiert das Tor Browser Bundle mit dem Schlüssel 0x63FEE659. Um diesen Schlüssel zu importieren, führe folendes aus: <pre> @@ -57,7 +57,7 @@ sub 2048R/EB399FD7 2003-10-16 Sie sollten die Meldung &quot;Korrekte Signature&quot;. Eine falsche Signatur kann bedeuten das die Software manipuliert wurde. Sollten Sie die feststellen dann senden Sie uns bitte eine e-Mail in der Sie uns mitteilen wo Sie die Software heruntergeladen haben, wie Sie diese verifiziert haben und die Ausgabe von GnuPG an help(a)rt.torproject.org. Wenn Sie die Signatur verifiziert haben und die Meldung &quot;Korrekte Signatur&quot; erhalten haben dann können Sie mit dem Entpacken des Archivs fortfahren. Danach sollten Sie ein Verzeichnis mit dem Namen tor-browser_en-US sehen können. Darin befindet sich ein weiteres Verzeichnis mit der Bezeichnung Docs das eine Datei mit dem Namen changelog enthalten sollte. Die Versionsnummer die am Anfang dieser Datei steht sollte der Version die im Namen der Datei steht entsprechen. <h3 id="how-to-use-the-tor-browser-bundle">Wie benutze ich das Tor Browser Bundle?</h3> - Nachdem Sie das Tor-Browser Paket heruntergeladen und entpackt haben, sollten sie einen Ordner, der einige Dateien enthält, sehen. Eine dieser Dateien ist eine Anwendung, die den Namen "Start Tor Browser" (oder start-tor-browser, abhängig von ihrem Betriebssystem) trägt. + Nachdem Sie das Tor Browser Bundle heruntergeladen haben, müssen sie es entpacken. Nach dem entpacken sollten sie einen Ordner sehen, der einige Dateien enthält. Eine dieser Dateien ist eine Anwendung mit dem Namen "Start Tor Browser" (oder start-tor-browser, je nachdem welches Betriebssystem sie benutzen). Wenn Sie das Tor Browser Bundle starten öffnet sich als erstes die Software Vidalia und verbindet Sie automatisch mit dem Tor Netzwerk. Danach erhalten Sie eine Bestätigung im Browser das Sie nun das Tor Netzwerk verwenden.Dieses wird Ihnen dann angezeigt durch <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Ab diesem Moment verwenden Sie das Tor Netzwerk für das browsen im Internet. Bitte berücksichtige, dass es wichtig ist den Browser aus dem Bundle zu verwenden und nicht den eigenen. <h3 id="what-to-do-when-tor-does-not-connect">Was kann ich tun wenn Tor das Netzwerk nicht kontaktieren kann?</h3> @@ -79,7 +79,7 @@ sub 2048R/EB399FD7 2003-10-16 <ol style="list-style-type: decimal"> <li>Öffnen Sie das Vidalia Kontroll-Menü und klicken Sie auf Einstellungen.</li> <li>Klicken Sie jetzt auf Netzwerk und wählen Sie dort Ich benutze einen Proxy Server für das Internet aus.</li> - <li>Geben Sie in der Zeile Adresse die Adresse des offenen Proxys ein. Dies kann ein Domain-Name oder eine IP-Adresse sein. 4: Tragen Sie den Port des Proxys ein.</li> + <li>Geben Sie in der Zeile Adresse die Adresse des offenen Proxys ein. Dies kann ein Domain-Name oder eine IP-Adresse sein. 4: Tragen Sie den Port des Proxys ein.</li> <li>Tragen Sie den Port des Proxys ein.</li> <li>Generell benötigen Sie keinen Benutzernamen und Passwort. Sollten Sie diese doch benötigen dann tragen Sie die Informationen bitte in die entsprechenden Felder ein.</li> <li>Wählen Sie jetzt den Typ des Proxys aus den Sie benutzen, sie können zwischen HTTP/HTTPS, SOCKS4 und SOCKS5 wählen.</li>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 31 May '12

31 May '12

commit 6e14acb726be9e65f25da3639eb81d561f7fccf8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 31 01:15:07 2012 +0000 Update translations for tsum --- de/short-user-manual_de_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de/short-user-manual_de_noimg.xhtml b/de/short-user-manual_de_noimg.xhtml index 2ffe38a..9216850 100644 --- a/de/short-user-manual_de_noimg.xhtml +++ b/de/short-user-manual_de_noimg.xhtml @@ -22,12 +22,12 @@ Nachtrag: Das Tor Browser Bundle für Linux und Mac OS X sind große Datein die Sie mit Mail Accounts von Gmail, Hotmail oder Yahoo nicht empfangen können. Sollte dies bei Ihnen der Fall sein dann wenden Sie sich bitte an help(a)rt.torproject.org, wir werden Ihenen dann eine Liste mit Mirror Servern zukommen lassen wo Sie die Software herunterladen können. <h3 id="tor-for-smartphones">Tor für Smartphones</h3> Sie können Tor auf Ihrem Android Gerät installieren. Sie benötigen dafür das Paket Orbot. Informationen zum Download und zur Installation erhalten Sie auf der <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>. - We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/ios/">Apple iOS</a>. + Wir haben auch experimentelle Pakete für <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> und <a href="http://sid77.slackware.it/ios/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">Wie kann ich sicherstellen das ich die richtige Version habe?</h3> Bevor Säie das Tor Browser Bundle verwenden stellen Sie bitte sicher das Sie die richtige Version benutzen. Die Software, die du erhältst kommt mit einer Datei, die den selben Namen hat, wie das das Bundle und einer .asc Dateiendung. Diese .asc-Datei ist eine GPG-Signatur und erlaubt es dir sicherzustellen, dass die Datei die du geladen hast genau die ist die wir dir auch zukommen lassen wollten. Bevor du die Signatur überprüfen können, musst du GnuPG herunterladen und installieren: - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: Most Linux distributions come with GnuPG preinstalled. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: Die meisten Linux Versionen kommen mit vorinstalliertem GnuPG. Bitte beachte, dass die folgenden Pfade und Befehle geändert werden müssen, damit es auf deinem System funktioniert. Erinn Clark signiert das Tor Browser Bundle mit dem Schlüssel 0x63FEE659. Um diesen Schlüssel zu importieren, führe folendes aus: <pre> @@ -57,7 +57,7 @@ sub 2048R/EB399FD7 2003-10-16 Sie sollten die Meldung &quot;Korrekte Signature&quot;. Eine falsche Signatur kann bedeuten das die Software manipuliert wurde. Sollten Sie die feststellen dann senden Sie uns bitte eine e-Mail in der Sie uns mitteilen wo Sie die Software heruntergeladen haben, wie Sie diese verifiziert haben und die Ausgabe von GnuPG an help(a)rt.torproject.org. Wenn Sie die Signatur verifiziert haben und die Meldung &quot;Korrekte Signatur&quot; erhalten haben dann können Sie mit dem Entpacken des Archivs fortfahren. Danach sollten Sie ein Verzeichnis mit dem Namen tor-browser_en-US sehen können. Darin befindet sich ein weiteres Verzeichnis mit der Bezeichnung Docs das eine Datei mit dem Namen changelog enthalten sollte. Die Versionsnummer die am Anfang dieser Datei steht sollte der Version die im Namen der Datei steht entsprechen. <h3 id="how-to-use-the-tor-browser-bundle">Wie benutze ich das Tor Browser Bundle?</h3> - After downloading the Tor Browser Bundle, extract the package onto your desktop or a USB stick. You should have a directory containing a few files. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). + Nachdem Sie das Tor Browser Bundle heruntergeladen haben, müssen sie es entpacken. Nach dem entpacken sollten sie einen Ordner sehen, der einige Dateien enthält. Eine dieser Dateien ist eine Anwendung mit dem Namen "Start Tor Browser" (oder start-tor-browser, je nachdem welches Betriebssystem sie benutzen). Wenn Sie das Tor Browser Bundle starten öffnet sich als erstes die Software Vidalia und verbindet Sie automatisch mit dem Tor Netzwerk. Danach erhalten Sie eine Bestätigung im Browser das Sie nun das Tor Netzwerk verwenden.Dieses wird Ihnen dann angezeigt durch <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Ab diesem Moment verwenden Sie das Tor Netzwerk für das browsen im Internet. Bitte berücksichtige, dass es wichtig ist den Browser aus dem Bundle zu verwenden und nicht den eigenen. <h3 id="what-to-do-when-tor-does-not-connect">Was kann ich tun wenn Tor das Netzwerk nicht kontaktieren kann?</h3>

1 0

[torbutton/master] Update changelog for 1.4.6.
by mikeperry＠torproject.org 31 May '12

31 May '12

commit d4fb673fdd37ec316b39d4247964e1e8ab4e2a9a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed May 30 17:06:07 2012 -0700 Update changelog for 1.4.6. --- src/CHANGELOG | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4c049ae..5a5c3ba 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,18 @@ +1.4.6 + 30 May 2012 + * Bug 5710: Prevent all sessionstore data saving in TBB + * Bug 5715: Explicitly clear image cache on TBB New Identity + * Bug 4660: Clear search and find boxes on TBB New Identity + * Bug 5729: Make New Identity and New Window a multiple of 200x100px + * Bug 4755: Spoof screen coordinates for DOM MouseEvents + * Bug 4718: Make TBB version check happen on New Window+New Identity + * Bug 5758: Disable WebSockets and IndexedDB for non-TBB users + * Bug 5863: Remove the ability to toggle Torbutton (to prevent leaks) + * Bug 3838: Inform Torbutton users about TBB + * Bug 5092: Sign Torbutton Updates + * Bugs 5673+5732: Change captcha redirect to startpage.com + * Bug 3845: Bump Firefox user agent to 10.0-ESR + 1.4.5.1 17 Dec 2011 * bug 4722: Fix ability to drag tabs on Windows (due to #4517)

1 0

[torbutton/master] Bug 5092: Add update key to install.rdf.
by mikeperry＠torproject.org 30 May '12

30 May '12

commit 634ad5e09d63e19871ca90bf14269674956d620c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed May 30 16:05:52 2012 -0700 Bug 5092: Add update key to install.rdf. Let's hope I don't lose this thing... --- src/install.rdf | 84 +++++++++++++----------------------------------------- 1 files changed, 20 insertions(+), 64 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index 371d353..e6c3be6 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -1,65 +1,21 @@ <?xml version="1.0"?> -<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:em="http://www.mozilla.org/2004/em-rdf#"> - - <Description about="urn:mozilla:install-manifest"> - <em:name>Torbutton</em:name> - <em:creator>Mike Perry & Kory Kirk</em:creator> - <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.5.1</em:version> - <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> - <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> - <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL> - <em:updateURL>https://www.torproject.org/torbutton/update.rdf</em:updateURL> -  - <em:targetApplication> - <Description> - <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>3.0</em:minVersion> -  - <em:maxVersion>10000.0</em:maxVersion> - </Description> - </em:targetApplication> - -  - -  - -  -  - </Description> - -</RDF> +<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#" + xmlns:NC="http://home.netscape.com/NC-rdf#" + xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <RDF:Description RDF:about="rdf:#$jIW5u3" + em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" + em:minVersion="3.0" + em:maxVersion="10000.0" /> + <RDF:Description RDF:about="urn:mozilla:install-manifest" + em:name="Torbutton" + em:creator="Mike Perry" + em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}" + em:version="1.4.6" + em:homepageURL="https://www.torproject.org/torbutton/" + em:optionsURL="chrome://torbutton/content/preferences.xul" + em:iconURL="chrome://torbutton/skin/tor.png" + em:updateURL="https://www.torproject.org/torbutton/update.rdf" + em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1T8SmtWvdBibisbQdmNxSP9sCyoc5rPoTFfntg3uXo6KpCtTzCPSc5a3MCHJIUBuPDfr73IIQvb6cyPG4MB6xe+oVGiffW3Fm4R1u6UX4TtEG/GF5QGxfVTrbyxbGeR5fOm9O8TNZFwUNA/cu3gDtcJz2xGkE44IwYPfITLHBrQIDAQAB"> + <em:targetApplication RDF:resource="rdf:#$jIW5u3"/> + </RDF:Description> +</RDF:RDF>

1 0

[torbutton/master] Bug 3838: Inform Torbutton users about TBB
by mikeperry＠torproject.org 30 May '12

30 May '12

commit 08ab94d738eb27c0b759275b379c8656521dc96d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue May 29 13:57:03 2012 -0700 Bug 3838: Inform Torbutton users about TBB We launch a confirm dialog when they click on the button. --- src/chrome/content/torbutton.js | 28 ++++++++++++++++++++++++++++ src/chrome/locale/en/torbutton.properties | 1 + src/defaults/preferences/preferences.js | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c714a93..57aaef8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -629,6 +629,30 @@ function torbutton_prompt_for_language_preference() { m_tb_prefs.setBoolPref("extensions.torbutton.prompted_language", true); } +function torbutton_inform_about_tbb() { + var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Components.interfaces.nsIPromptService); + + var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_OK; + + var strings = torbutton_get_stringbundle(); + var message = strings.GetStringFromName("torbutton.popup.prompt_torbrowser"); + var checkbox = {value: false}; + + var sb = Components.classes["@mozilla.org/intl/stringbundle;1"] + .getService(Components.interfaces.nsIStringBundleService); + var browserstrings = sb.createBundle("chrome://browser/locale/browser.properties"); + + var askagain = browserstrings.GetStringFromName("privateBrowsingNeverAsk"); + + var response = prompts.confirmEx(null, "", message, flags, null, null, null, + askagain, checkbox); + + // Update preferences to reflect their response and to prevent the prompt from + // being displayed again. + m_tb_prefs.setBoolPref("extensions.torbutton.prompt_torbrowser", !checkbox.value); +} + //this function checks to see if the context menu is being clicked on a link. //if it is, then we show the two context menu items function torbutton_check_contextmenu() { @@ -2219,6 +2243,10 @@ function torbutton_check_protections() if (!m_tb_control_pass || !m_tb_control_port) document.getElementById("torbutton-new-identity").disabled = true; + + if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { + torbutton_inform_about_tbb(); + } } function torbutton_open_cookie_dialog() { diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 773e8db..aa0167c 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -40,3 +40,4 @@ torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. +torbutton.popup.prompt_torbrowser = Torbutton is no longer safe to use in a browser that is also used for non-Tor browsing. We have disabled the ability to toggle Torbutton as a result.\n\nIf you wish to keep using Firefox for non-Tor browsing, you should uninstall Torbutton and download Tor Browser. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton. diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f8e6730..8dd2add 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -220,3 +220,4 @@ pref("extensions.torbutton.useragent_vendorSub",""); pref("extensions.torbutton.safecache",1); // 0=always, 1=during tor, 2=never pref("extensions.torbutton.dual_key_cookies",false); pref("extensions.torbutton.cookie_js_allow", true); +pref("extensions.torbutton.prompt_torbrowser", true);

1 0