Revert "Merge branch 'upstream' into tizen"

[platform/upstream/nettle.git] / salsa20-crypt.c

diff --git a/salsa20-crypt.c b/salsa20-crypt.c
index eef5c75..b061b4b 100644 (file)
--- a/salsa20-crypt.c
+++ b/salsa20-crypt.c
@@ -1,35 +1,27 @@
 /* salsa20-crypt.c
-
-   The Salsa20 stream cipher.
-
-   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/.
-*/
+ *
+ * The Salsa20 stream cipher.
+ */
+
+/* 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.
+ */
 
 /* Based on:
    salsa20-ref.c version 20051118
@@ -50,7 +42,7 @@
 
 void
 salsa20_crypt(struct salsa20_ctx *ctx,
-             size_t length,
+             unsigned length,
              uint8_t *c,
              const uint8_t *m)
 {
@@ -69,10 +61,10 @@ salsa20_crypt(struct salsa20_ctx *ctx,
       
       if (length <= SALSA20_BLOCK_SIZE)
        {
-         memxor3 (c, m, x, length);
+         memxor3 (c, m, (uint8_t *) x, length);
          return;
        }
-      memxor3 (c, m, x, SALSA20_BLOCK_SIZE);
+      memxor3 (c, m, (uint8_t *) x, SALSA20_BLOCK_SIZE);
 
       length -= SALSA20_BLOCK_SIZE;
       c += SALSA20_BLOCK_SIZE;