From 90112edb7993a1444fd367ac9a0ebb38de0bb605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Sun, 30 Mar 2014 16:28:28 +0200 Subject: Update copyright headers for dual licensing. --- salsa20-set-key.c | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'salsa20-set-key.c') diff --git a/salsa20-set-key.c b/salsa20-set-key.c index 7a120928..0f3a8ec0 100644 --- a/salsa20-set-key.c +++ b/salsa20-set-key.c @@ -1,27 +1,35 @@ /* salsa20-set-key.c - * - * The Salsa20 stream cipher. - */ - -/* nettle, low-level cryptographics library - * - * Copyright (C) 2012 Simon Josefsson, Niels Möller - * - * The nettle library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at your - * option) any later version. - * - * The nettle library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the nettle library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02111-1301, USA. - */ + + The Salsa20 stream cipher. + + Copyright (C) 2012 Simon Josefsson, Niels Möller + + This file is part of GNU Nettle. + + GNU Nettle is free software: you can redistribute it and/or + modify it under the terms of either: + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. + + GNU Nettle 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 copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see http://www.gnu.org/licenses/. +*/ /* Based on: salsa20-ref.c version 20051118 -- cgit v1.2.1