summaryrefslogtreecommitdiff
path: root/camellia256-set-encrypt-key.c
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2014-03-30 16:28:28 +0200
committerNiels Möller <nisse@lysator.liu.se>2014-04-12 09:44:29 +0200
commit90112edb7993a1444fd367ac9a0ebb38de0bb605 (patch)
tree155496c32a6c1eb758856ad59ddd231a8473cf8c /camellia256-set-encrypt-key.c
parentb08824a98082e3b0b213cfaa7eb53e59bf7b6c78 (diff)
downloadnettle-90112edb7993a1444fd367ac9a0ebb38de0bb605.tar.gz
Update copyright headers for dual licensing.
Diffstat (limited to 'camellia256-set-encrypt-key.c')
-rw-r--r--camellia256-set-encrypt-key.c57
1 files changed, 34 insertions, 23 deletions
diff --git a/camellia256-set-encrypt-key.c b/camellia256-set-encrypt-key.c
index 189ff5d2..608224e7 100644
--- a/camellia256-set-encrypt-key.c
+++ b/camellia256-set-encrypt-key.c
@@ -1,27 +1,38 @@
/* camellia256-set-encrypt-key.c
- *
- * Key setup for the camellia block cipher.
- */
-/*
- * Copyright (C) 2006,2007
- * NTT (Nippon Telegraph and Telephone Corporation).
- *
- * Copyright (C) 2010, 2013 Niels Möller
- *
- * This 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.
- *
- * This 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 this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
+
+ Key setup for the camellia block cipher.
+
+ Copyright (C) 2006,2007 NTT
+ (Nippon Telegraph and Telephone Corporation).
+
+ Copyright (C) 2010, 2013 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/.
+*/
/*
* Algorithm Specification