Revert "Merge branch 'upstream' into tizen"

[platform/upstream/nettle.git] / cbc.c

diff --git a/cbc.c b/cbc.c
index 85ad255..e70619b 100644 (file)
--- a/cbc.c
+++ b/cbc.c
@@ -1,35 +1,27 @@
 /* cbc.c
-
-   Cipher block chaining mode.
-
-   Copyright (C) 2001, 2011 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/.
-*/
+ *
+ * Cipher block chaining mode.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2001 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.
+ */
 
 #if HAVE_CONFIG_H
 # include "config.h"
@@ -45,9 +37,9 @@
 #include "nettle-internal.h"
 
 void
-cbc_encrypt(const void *ctx, nettle_cipher_func *f,
-           size_t block_size, uint8_t *iv,
-           size_t length, uint8_t *dst,
+cbc_encrypt(void *ctx, nettle_crypt_func *f,
+           unsigned block_size, uint8_t *iv,
+           unsigned length, uint8_t *dst,
            const uint8_t *src)
 {
   assert(!(length % block_size));
@@ -64,9 +56,9 @@ cbc_encrypt(const void *ctx, nettle_cipher_func *f,
 #define CBC_BUFFER_LIMIT 512
 
 void
-cbc_decrypt(const void *ctx, nettle_cipher_func *f,
-           size_t block_size, uint8_t *iv,
-           size_t length, uint8_t *dst,
+cbc_decrypt(void *ctx, nettle_crypt_func *f,
+           unsigned block_size, uint8_t *iv,
+           unsigned length, uint8_t *dst,
            const uint8_t *src)
 {
   assert(!(length % block_size));
@@ -98,7 +90,7 @@ cbc_decrypt(const void *ctx, nettle_cipher_func *f,
       TMP_DECL(buffer, uint8_t, CBC_BUFFER_LIMIT);
       TMP_DECL(initial_iv, uint8_t, NETTLE_MAX_CIPHER_BLOCK_SIZE);
 
-      size_t buffer_size;
+      unsigned buffer_size;
 
       if (length <= CBC_BUFFER_LIMIT)
        buffer_size = length;