Revert "Merge branch 'upstream' into tizen"

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

diff --git a/umac32.c b/umac32.c
index 32f34c3..fd8a281 100644 (file)
--- a/umac32.c
+++ b/umac32.c
@@ -1,33 +1,25 @@
 /* umac32.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/.
-*/
+ */
+
+/* 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.
+ */
 
 #if HAVE_CONFIG_H
 # include "config.h"
@@ -57,7 +49,7 @@ umac32_set_key (struct umac32_ctx *ctx, const uint8_t *key)
 
 void
 umac32_set_nonce (struct umac32_ctx *ctx,
-                 size_t nonce_length, const uint8_t *nonce)
+                 unsigned nonce_length, const uint8_t *nonce)
 {
   assert (nonce_length > 0);
   assert (nonce_length <= AES_BLOCK_SIZE);
@@ -72,14 +64,14 @@ umac32_set_nonce (struct umac32_ctx *ctx,
 
 #define UMAC32_BLOCK(ctx, block) do {                                  \
     uint64_t __umac32_y                                                        \
-      = _umac_nh (ctx->l1_key, UMAC_BLOCK_SIZE, block)                 \
-      + 8*UMAC_BLOCK_SIZE ;                                            \
+      = _umac_nh (ctx->l1_key, UMAC_DATA_SIZE, block)                  \
+      + 8*UMAC_DATA_SIZE ;                                             \
     _umac_l2 (ctx->l2_key, ctx->l2_state, 1, ctx->count++, &__umac32_y); \
   } while (0)
 
 void
 umac32_update (struct umac32_ctx *ctx,
-              size_t length, const uint8_t *data)
+              unsigned length, const uint8_t *data)
 {
   MD_UPDATE (ctx, length, data, UMAC32_BLOCK, (void)0);
 }
@@ -87,7 +79,7 @@ umac32_update (struct umac32_ctx *ctx,
 
 void
 umac32_digest (struct umac32_ctx *ctx,
-              size_t length, uint8_t *digest)
+              unsigned length, uint8_t *digest)
 {
   uint32_t pad;
 
@@ -108,8 +100,8 @@ umac32_digest (struct umac32_ctx *ctx,
   assert (ctx->count > 0);
   if ( !(ctx->nonce_low & _UMAC_NONCE_CACHED))
     {
-      aes128_encrypt (&ctx->pdf_key, AES_BLOCK_SIZE,
-                     (uint8_t *) ctx->pad_cache, ctx->nonce);
+      aes_encrypt (&ctx->pdf_key, AES_BLOCK_SIZE,
+                  (uint8_t *) ctx->pad_cache, ctx->nonce);
       ctx->nonce_low |= _UMAC_NONCE_CACHED;
     }