From 7e346cfcb877d44bb8976c2dfa98f1d7e0bcc72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 8 Nov 2015 15:25:57 -0500
Subject: [PATCH] update license terms
* removed OpenSSL exception
(OpenDHT doesn't make use of OpenSSL)
* properly capitalize "Savoir-faire Linux"
---
include/opendht.h | 13 +------------
include/opendht/crypto.h | 13 +------------
include/opendht/default_types.h | 13 +------------
include/opendht/dht.h | 2 +-
include/opendht/dhtrunner.h | 13 +------------
include/opendht/infohash.h | 13 +------------
include/opendht/rng.h | 13 +------------
include/opendht/securedht.h | 4 ++--
include/opendht/value.h | 13 +------------
src/crypto.cpp | 13 +------------
src/default_types.cpp | 13 +------------
src/dht.cpp | 2 +-
src/dhtrunner.cpp | 13 +------------
src/infohash.cpp | 13 +------------
src/rng.cpp | 13 +------------
src/securedht.cpp | 13 +------------
src/value.cpp | 13 +------------
tools/dhtchat.cpp | 13 +------------
tools/dhtnode.cpp | 13 +------------
tools/dhtscanner.cpp | 13 +------------
tools/tools_common.h | 13 +------------
21 files changed, 22 insertions(+), 220 deletions(-)
diff --git a/include/opendht.h b/include/opendht.h
index c6f8a1b3..a5dafeb2 100644
--- a/include/opendht.h
+++ b/include/opendht.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#pragma once
diff --git a/include/opendht/crypto.h b/include/opendht/crypto.h
index 16990f9c..8a2f3f4a 100644
--- a/include/opendht/crypto.h
+++ b/include/opendht/crypto.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#pragma once
diff --git a/include/opendht/default_types.h b/include/opendht/default_types.h
index c6d8907c..0b32dc60 100644
--- a/include/opendht/default_types.h
+++ b/include/opendht/default_types.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#pragma once
diff --git a/include/opendht/dht.h b/include/opendht/dht.h
index 77af07f9..373b0c3b 100644
--- a/include/opendht/dht.h
+++ b/include/opendht/dht.h
@@ -1,6 +1,6 @@
/*
Copyright (c) 2009-2014 Juliusz Chroboczek
-Copyright (c) 2014-2015 Savoir-Faire Linux Inc.
+Copyright (c) 2014-2015 Savoir-faire Linux Inc.
Authors : Adrien Béraud <adrien.beraud@savoirfairelinux.com>,
Juliusz Chroboczek <jch@pps.univ–paris–diderot.fr>
diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h
index 22b08fee..11c49789 100644
--- a/include/opendht/dhtrunner.h
+++ b/include/opendht/dhtrunner.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#pragma once
diff --git a/include/opendht/infohash.h b/include/opendht/infohash.h
index 01a2c306..75a4552b 100644
--- a/include/opendht/infohash.h
+++ b/include/opendht/infohash.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#pragma once
diff --git a/include/opendht/rng.h b/include/opendht/rng.h
index 63e347f0..d3c8118d 100644
--- a/include/opendht/rng.h
+++ b/include/opendht/rng.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include <random>
diff --git a/include/opendht/securedht.h b/include/opendht/securedht.h
index 20e48666..35c91103 100644
--- a/include/opendht/securedht.h
+++ b/include/opendht/securedht.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
* 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, Savoir-Faire Linux Inc.
+ * terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
* 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
diff --git a/include/opendht/value.h b/include/opendht/value.h
index b79f8b34..6423ca1d 100644
--- a/include/opendht/value.h
+++ b/include/opendht/value.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#pragma once
diff --git a/src/crypto.cpp b/src/crypto.cpp
index ca836e8c..b1fb77e8 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "crypto.h"
diff --git a/src/default_types.cpp b/src/default_types.cpp
index ebe57b1b..86ff073c 100644
--- a/src/default_types.cpp
+++ b/src/default_types.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "default_types.h"
diff --git a/src/dht.cpp b/src/dht.cpp
index 17276b3e..93c05348 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -1,6 +1,6 @@
/*
Copyright (c) 2009-2014 Juliusz Chroboczek
-Copyright (c) 2014-2015 Savoir-Faire Linux Inc.
+Copyright (c) 2014-2015 Savoir-faire Linux Inc.
Authors : Adrien Béraud <adrien.beraud@savoirfairelinux.com>,
Juliusz Chroboczek <jch@pps.univ–paris–diderot.fr>
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index 0822d241..b5766d4a 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "dhtrunner.h"
diff --git a/src/infohash.cpp b/src/infohash.cpp
index 7835c8b3..c00a2e55 100644
--- a/src/infohash.cpp
+++ b/src/infohash.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "infohash.h"
diff --git a/src/rng.cpp b/src/rng.cpp
index 3e02bbd7..2d1556ed 100644
--- a/src/rng.cpp
+++ b/src/rng.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "rng.h"
diff --git a/src/securedht.cpp b/src/securedht.cpp
index 5ee1e2fd..d6469757 100644
--- a/src/securedht.cpp
+++ b/src/securedht.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "securedht.h"
diff --git a/src/value.cpp b/src/value.cpp
index 16b63801..2d1bdad5 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
* Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -15,17 +15,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "value.h"
diff --git a/tools/dhtchat.cpp b/tools/dhtchat.cpp
index c610b546..9b6719bb 100644
--- a/tools/dhtchat.cpp
+++ b/tools/dhtchat.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "tools_common.h"
diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index 3dae0d37..0a0a9e02 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "tools_common.h"
diff --git a/tools/dhtscanner.cpp b/tools/dhtscanner.cpp
index f2c6ecd4..507711c9 100644
--- a/tools/dhtscanner.cpp
+++ b/tools/dhtscanner.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
#include "tools_common.h"
diff --git a/tools/tools_common.h b/tools/tools_common.h
index c1aebb09..c1a73d85 100644
--- a/tools/tools_common.h
+++ b/tools/tools_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2014-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -16,17 +16,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.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * 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, Savoir-Faire Linux Inc.
- * 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.
*/
// Common utility methods used by C++ OpenDHT tools.
--
GitLab