diff options
author | Niels Möller <nisse@lysator.liu.se> | 2014-03-30 16:28:28 +0200 |
---|---|---|
committer | Niels Möller <nisse@lysator.liu.se> | 2014-04-12 09:44:29 +0200 |
commit | 90112edb7993a1444fd367ac9a0ebb38de0bb605 (patch) | |
tree | 155496c32a6c1eb758856ad59ddd231a8473cf8c /salsa20-128-set-key.c | |
parent | b08824a98082e3b0b213cfaa7eb53e59bf7b6c78 (diff) | |
download | nettle-90112edb7993a1444fd367ac9a0ebb38de0bb605.tar.gz |
Update copyright headers for dual licensing.
Diffstat (limited to 'salsa20-128-set-key.c')
-rw-r--r-- | salsa20-128-set-key.c | 57 |
1 files changed, 33 insertions, 24 deletions
diff --git a/salsa20-128-set-key.c b/salsa20-128-set-key.c index 4157c0c7..cf44c239 100644 --- a/salsa20-128-set-key.c +++ b/salsa20-128-set-key.c @@ -1,27 +1,36 @@ -/* - * The Salsa20 stream cipher. - */ - -/* nettle, low-level cryptographics library - * - * Copyright (C) 2012 Simon Josefsson - * Copyright (C) 2012-2014 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. - */ +/* salsa20-128-set-key.c + + The Salsa20 stream cipher. Key setup for 256-bit keys. + + Copyright (C) 2012 Simon Josefsson + Copyright (C) 2012-2014 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 |