From 490b7143b12c97780ed75d3000b029205a451dec Mon Sep 17 00:00:00 2001 From: Andrew Ayer Date: Tue, 5 Mar 2013 12:02:49 -0800 Subject: [PATCH] Update copyright notice to include OpenSSL linking exception --- commands.cpp | 11 +++++++++++ commands.hpp | 11 +++++++++++ crypto.cpp | 11 +++++++++++ crypto.hpp | 11 +++++++++++ git-crypt.cpp | 11 +++++++++++ util.cpp | 11 +++++++++++ util.hpp | 11 +++++++++++ 7 files changed, 77 insertions(+) diff --git a/commands.cpp b/commands.cpp index d81c31c..fcd5851 100644 --- a/commands.cpp +++ b/commands.cpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #include "commands.hpp" diff --git a/commands.hpp b/commands.hpp index baa03c2..ce68129 100644 --- a/commands.hpp +++ b/commands.hpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #ifndef _COMMANDS_H diff --git a/crypto.cpp b/crypto.cpp index e1f3653..e1a8594 100644 --- a/crypto.cpp +++ b/crypto.cpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #define _BSD_SOURCE diff --git a/crypto.hpp b/crypto.hpp index 6e31840..e8166e2 100644 --- a/crypto.hpp +++ b/crypto.hpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #ifndef _CRYPTO_H diff --git a/git-crypt.cpp b/git-crypt.cpp index a19834a..209501b 100644 --- a/git-crypt.cpp +++ b/git-crypt.cpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #include "commands.hpp" diff --git a/util.cpp b/util.cpp index ccde427..4ae39c7 100644 --- a/util.cpp +++ b/util.cpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #include "util.hpp" diff --git a/util.hpp b/util.hpp index 2c8416b..722d0de 100644 --- a/util.hpp +++ b/util.hpp @@ -15,6 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with git-crypt. If not, see . + * + * Additional permission under GNU GPL version 3 section 7: + * + * If you modify the 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 licensors of the Program + * grant 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. */ #ifndef _UTIL_H