cfb8: Fix decrypt path

[gd/nettle] / aes-set-encrypt-key.c

diff --git a/aes-set-encrypt-key.c b/aes-set-encrypt-key.c
index 04f53270f38c8cef3ab54f63da0bcb6ae67601fd..ed417fcd5e4286778155ae730b728c80493c6fac 100644 (file)
--- a/aes-set-encrypt-key.c
+++ b/aes-set-encrypt-key.c
@@ -1,81 +1,62 @@
 /* aes-set-encrypt-key.c
- *
- * Key setup for the aes/rijndael block cipher.
- */
 
-/* nettle, low-level cryptographics library
- *
- * Copyright (C) 2000, 2001, 2002 Rafael R. Sevilla, 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.
- */
+   Key setup for the aes/rijndael block cipher.
 
-/* Originally written by Rafael R. Sevilla <dido@pacific.net.ph> */
+   Copyright (C) 2000, 2001, 2002 Rafael R. Sevilla, Niels Möller
+   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/.
+*/
 
 #if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <assert.h>
+#include <stdlib.h>
 
-#include "aes-internal.h"
-#include "macros.h"
+#include "aes.h"
 
 void
 aes_set_encrypt_key(struct aes_ctx *ctx,
-                   size_t keysize, const uint8_t *key)
+                   size_t key_size, const uint8_t *key)
 {
-  static const uint8_t rcon[10] = {
-    0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x1b,0x36,
-  };
-  unsigned nk, nr, i, lastkey;
-  uint32_t temp;
-  const uint8_t *rp;
-
-  assert(keysize >= AES_MIN_KEY_SIZE);
-  assert(keysize <= AES_MAX_KEY_SIZE);
-  
-  /* Truncate keysizes to the valid key sizes provided by Rijndael */
-  if (keysize == 32) {
-    nk = 8;
-    nr = 14;
-  } else if (keysize >= 24) {
-    nk = 6;
-    nr = 12;
-  } else { /* must be 16 or more */
-    nk = 4;
-    nr = 10;
-  }
-
-  lastkey = (AES_BLOCK_SIZE/4) * (nr + 1);
-  ctx->nrounds = nr;
-
-  for (i=0, rp = rcon; i<nk; i++)
-    ctx->keys[i] = LE_READ_UINT32(key + i*4);
-
-  for (i=nk; i<lastkey; i++)
+  switch (key_size)
     {
-      temp = ctx->keys[i-1];
-      if (i % nk == 0)
-       temp = SUBBYTE(ROTL32(24, temp), aes_sbox) ^ *rp++;
-
-      else if (nk > 6 && (i%nk) == 4)
-       temp = SUBBYTE(temp, aes_sbox);
-
-      ctx->keys[i] = ctx->keys[i-nk] ^ temp;
+    default: abort();
+    case AES128_KEY_SIZE:
+      aes128_set_encrypt_key(&ctx->u.ctx128, key);
+      break;
+    case AES192_KEY_SIZE:
+      aes192_set_encrypt_key(&ctx->u.ctx192, key);
+      break;
+    case AES256_KEY_SIZE:
+      aes256_set_encrypt_key(&ctx->u.ctx256, key);
+      break;
     }
-}
   
+  ctx->key_size = key_size;
+}