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 /pbkdf2.h | |
| parent | b08824a98082e3b0b213cfaa7eb53e59bf7b6c78 (diff) | |
| download | nettle-90112edb7993a1444fd367ac9a0ebb38de0bb605.tar.gz | |
Update copyright headers for dual licensing.
Diffstat (limited to 'pbkdf2.h')
| -rw-r--r-- | pbkdf2.h | 54 |
1 files changed, 31 insertions, 23 deletions
@@ -1,27 +1,35 @@ /* pbkdf2.h - * - * PKCS #5 password-based key derivation function PBKDF2, see RFC 2898. - */ - -/* nettle, low-level cryptographics library - * - * Copyright (C) 2012 Simon Josefsson - * - * 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. - */ + + PKCS #5 password-based key derivation function PBKDF2, see RFC 2898. + + Copyright (C) 2012 Simon Josefsson + + 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/. +*/ #ifndef NETTLE_PBKDF2_H_INCLUDED #define NETTLE_PBKDF2_H_INCLUDED |