Update copyright headers for dual licensing.

[gd/nettle] / ecc-hash.c

diff --git a/ecc-hash.c b/ecc-hash.c
index 0de3c18729abe36ade4cd43c8ef82a7254f55254..547e8dbd89fb27e810725a4055c70499915f8fc7 100644 (file)
--- a/ecc-hash.c
+++ b/ecc-hash.c
@@ -1,33 +1,41 @@
-/* ecdsa-hash.c */
-
-/* nettle, low-level cryptographics library
- *
- * Copyright (C) 2013 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.
- */
-
-/* Development of Nettle's ECC support was funded by Internetfonden. */
+/* ecdsa-hash.c
+
+   Copyright (C) 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/.
+*/
+
+/* Development of Nettle's ECC support was funded by the .SE Internet Fund. */
 
 #if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "ecc-internal.h"
-#include "gmp-glue.h"
 
 /* Convert hash value to an integer. If the digest is larger than
    the ecc bit size, then we must truncate it and use the leftmost
@@ -42,12 +50,12 @@
 void
 ecc_hash (const struct ecc_curve *ecc,
          mp_limb_t *hp,
-         unsigned length, const uint8_t *digest)
+         size_t length, const uint8_t *digest)
 {
-  if (length > ((unsigned) ecc->bit_size + 7) / 8)
+  if (length > ((size_t) ecc->bit_size + 7) / 8)
     length = (ecc->bit_size + 7) / 8;
 
-  _mpn_set_base256 (hp, ecc->size + 1, digest, length);
+  mpn_set_base256 (hp, ecc->size + 1, digest, length);
 
   if (8 * length > ecc->bit_size)
     /* We got a few extra bits, at the low end. Discard them. */