diff --git a/include/opendht/crypto.h b/include/opendht/crypto.h index c1154348..42294b20 100644 --- a/include/opendht/crypto.h +++ b/include/opendht/crypto.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/include/opendht/default_types.h b/include/opendht/default_types.h index d9b505ea..f6931e95 100644 --- a/include/opendht/default_types.h +++ b/include/opendht/default_types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/include/opendht/dht.h b/include/opendht/dht.h index 2bfe8770..e141719a 100644 --- a/include/opendht/dht.h +++ b/include/opendht/dht.h @@ -1,6 +1,6 @@ /* Copyright (c) 2009-2014 Juliusz Chroboczek -Copyright (c) 2014 Savoir-Faire Linux Inc. +Copyright (c) 2014-2015 Savoir-Faire Linux Inc. Authors : Adrien Béraud , Juliusz Chroboczek diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h index afc69a57..e48e9df9 100644 --- a/include/opendht/dhtrunner.h +++ b/include/opendht/dhtrunner.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/include/opendht/infohash.h b/include/opendht/infohash.h index 39e15f4d..5821c09d 100644 --- a/include/opendht/infohash.h +++ b/include/opendht/infohash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/include/opendht/rng.h b/include/opendht/rng.h index d8be7ac6..9adf30ab 100644 --- a/include/opendht/rng.h +++ b/include/opendht/rng.h @@ -1,3 +1,33 @@ +/* + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. + * Author : Adrien Béraud + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * 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 Public License for more details. + * + * 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 namespace dht { diff --git a/include/opendht/securedht.h b/include/opendht/securedht.h index 0ce19bad..54ad7da0 100644 --- a/include/opendht/securedht.h +++ b/include/opendht/securedht.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/include/opendht/value.h b/include/opendht/value.h index 822d4be9..63fd6eef 100644 --- a/include/opendht/value.h +++ b/include/opendht/value.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/src/crypto.cpp b/src/crypto.cpp index 30ad0915..127d6547 100644 --- a/src/crypto.cpp +++ b/src/crypto.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify @@ -461,7 +461,7 @@ getDN(gnutls_x509_crt_t cert, const char* oid, bool issuer = false) ? gnutls_x509_crt_get_issuer_dn_by_oid(cert, oid, 0, 0, &(*dn.begin()), &dn_sz) : gnutls_x509_crt_get_dn_by_oid( cert, oid, 0, 0, &(*dn.begin()), &dn_sz); if (ret != GNUTLS_E_SUCCESS) - return {}; + return {}; dn.resize(dn_sz); return dn; } diff --git a/src/default_types.cpp b/src/default_types.cpp index 230ac587..63b413f9 100644 --- a/src/default_types.cpp +++ b/src/default_types.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/src/dht.cpp b/src/dht.cpp index 17d6ab1f..fb10126e 100644 --- a/src/dht.cpp +++ b/src/dht.cpp @@ -1,6 +1,6 @@ /* Copyright (c) 2009-2014 Juliusz Chroboczek -Copyright (c) 2014 Savoir-Faire Linux Inc. +Copyright (c) 2014-2015 Savoir-Faire Linux Inc. Authors : Adrien Béraud , Juliusz Chroboczek diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp index ce5fe0f7..1f2b7cea 100644 --- a/src/dhtrunner.cpp +++ b/src/dhtrunner.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/src/infohash.cpp b/src/infohash.cpp index 4a5b0755..14cbdfb3 100644 --- a/src/infohash.cpp +++ b/src/infohash.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/src/rng.cpp b/src/rng.cpp index e3f19f73..2a8020c1 100644 --- a/src/rng.cpp +++ b/src/rng.cpp @@ -1,3 +1,33 @@ +/* + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. + * Author : Adrien Béraud + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * 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 Public License for more details. + * + * 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" #include diff --git a/src/securedht.cpp b/src/securedht.cpp index 45e3ab61..e91ff2c4 100644 --- a/src/securedht.cpp +++ b/src/securedht.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify diff --git a/src/value.cpp b/src/value.cpp index 08d20666..dc6c50f0 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Savoir-Faire Linux Inc. + * Copyright (C) 2014-2015 Savoir-Faire Linux Inc. * Author : Adrien Béraud * * This program is free software; you can redistribute it and/or modify