diff options
author | corvid <devnull@localhost> | 2015-06-15 18:07:15 +0000 |
---|---|---|
committer | corvid <devnull@localhost> | 2015-06-15 18:07:15 +0000 |
commit | 78659997b1836892163e7df2338846cb8879cf5b (patch) | |
tree | 733cf8cd1b5396606a7457b13cd5959d2a558276 | |
parent | ed75e925a9e494210fab821003d6a22053787011 (diff) |
handle openssl derivatives in the license permissions for the https dpi
FWIW, wget currently does it as follows:
"If you modify this program, or any covered work, by linking or
combining it with the OpenSSL project's OpenSSL library (or a
modified version of that library), containing parts covered by the
terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
grants you additional permission to convey the resulting work.
Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work."
-rw-r--r-- | dpi/https.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dpi/https.c b/dpi/https.c index 545d6a9b..766b3afb 100644 --- a/dpi/https.c +++ b/dpi/https.c @@ -22,11 +22,12 @@ * (at your option) any later version. * * As a special exception permission is granted to link the code of - * the https dillo plugin with the OpenSSL project's "OpenSSL" - * library, and distribute the linked executables, without including - * the source code for OpenSSL in the source distribution. You must - * obey the GNU General Public License, version 3, in all respects - * for all of the code used other than "OpenSSL". + * the https dillo plugin with the OpenSSL project's OpenSSL library + * (or a modified version of that library), and distribute the linked + * executables, without including the source code for the SSL library + * in the source distribution. You must obey the GNU General Public + * License, version 3, in all respects for all of the code used other + * than the SSL library. * */ |