commit 3c0c5ced208a6dcc09946b235fe39accdb721128 Author: Sebastian Hahn sebastian@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@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@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@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@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@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@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@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@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>
<!-- Qt-related library files --> @@ -123,14 +120,6 @@ <?endif?> </Component>
- <!-- OpenSSL-related library files --> - <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"?> <!-- Builds with Breakpad support must include the CRT. --> <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. </p>
<p> -EXCEPTION: This distribution of Vidalia may be linked against OpenSSL -according to the terms of the section below entitled "OpenSSL Exception." -</p> - -<p> 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. </p>
-<p> -<i>OpenSSL Exception</i> -</p> - -<p>0. Definitions</p> - -<p> -"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. -</p> -<p> -"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. -</p> -<p> -"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. -</p> - -<p>1. Exception</p> - -<p> -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. -</p> - -<p> -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. -</p> - <hr>
<h3>KDE Oxygen Icon Theme</h3>