From ecbef04692dd3833a985b96d8d849a651c9b3055 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 20 Feb 2015 08:46:40 -0500 Subject: [PATCH] Add a clear OpenSSL exception. We are linking with OpenSSL in 2 files, so make it clear we intentionally add a GPLv3 exception to allow that linking by third parties. Signed-off-by: Simo Sorce Reviewed-By: Nathaniel McCallum --- COPYING.openssl | 16 ++++++++++++++++ ipapython/ipap11helper/p11helper.c | 3 +++ util/ipa_pwd_ntlm.c | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 COPYING.openssl diff --git a/COPYING.openssl b/COPYING.openssl new file mode 100644 index 000000000..8a9246043 --- /dev/null +++ b/COPYING.openssl @@ -0,0 +1,16 @@ +ADDITIONAL PERMISSIONS + +This file is a modification of the main license file (COPYING), which +contains the license terms. It applies only to specific files in the +tree that include an "OpenSSL license exception" disclaimer. + +In addition to the governing license (GPLv3), as a special exception, +the copyright holders give permission to link the code of this program +with the OpenSSL library, and distribute linked combinations including +the two. +You must obey the GNU General Public License in all respects for all of +the code used other than OpenSSL. If you modify file(s) with this +exception, you may extend this exception to your version of the file(s), +but you are not obligated to do so. If you do not wish to do so, delete +this exception statement from your version. If you delete the exception +statement from all source files in the program, then also delete it here. diff --git a/ipapython/ipap11helper/p11helper.c b/ipapython/ipap11helper/p11helper.c index 4e0f26205..9172e720d 100644 --- a/ipapython/ipap11helper/p11helper.c +++ b/ipapython/ipap11helper/p11helper.c @@ -1,6 +1,9 @@ /* * Copyright (C) 2014 FreeIPA Contributors see COPYING for license * + * This file includes an "OpenSSL license exception", see the + * COPYING.openssl file for details. + * * This code is based on PKCS#11 code snippets from NLnetLabs: * http://www.nlnetlabs.nl/publications/hsm/examples/pkcs11/ * Original license follows: diff --git a/util/ipa_pwd_ntlm.c b/util/ipa_pwd_ntlm.c index 8ffa66660..c6abd4b8a 100644 --- a/util/ipa_pwd_ntlm.c +++ b/util/ipa_pwd_ntlm.c @@ -18,6 +18,10 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * + * This file includes an "OpenSSL license exception", see the + * COPYING.openssl file for details. + * */ #include