Revert "Merge branch 'upstream' into tizen"

[platform/upstream/nettle.git] / aes-decrypt.c

diff --git a/aes-decrypt.c b/aes-decrypt.c
index a0897f5..47fe3c1 100644 (file)
--- a/aes-decrypt.c
+++ b/aes-decrypt.c
@@ -1,35 +1,27 @@
 /* aes-decrypt.c
+ *
+ * Decryption function for aes/rijndael block cipher.
+ */
 
-   Decryption function for aes/rijndael block cipher.
-
-   Copyright (C) 2002, 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) 2002 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"
@@ -346,40 +338,10 @@ _aes_decrypt_table =
 
 void
 aes_decrypt(const struct aes_ctx *ctx,
-           size_t length, uint8_t *dst,
+           unsigned length, uint8_t *dst,
            const uint8_t *src)
 {
   assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(ctx->rounds, ctx->keys, &_aes_decrypt_table,
-              length, dst, src);
-}
-
-void
-aes128_decrypt(const struct aes128_ctx *ctx,
-              size_t length, uint8_t *dst,
-              const uint8_t *src)
-{
-  assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES128_ROUNDS, ctx->keys, &_aes_decrypt_table,
-              length, dst, src);
-}
-
-void
-aes192_decrypt(const struct aes192_ctx *ctx,
-              size_t length, uint8_t *dst,
-              const uint8_t *src)
-{
-  assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES192_ROUNDS, ctx->keys, &_aes_decrypt_table,
-              length, dst, src);
-}
-
-void
-aes256_decrypt(const struct aes256_ctx *ctx,
-              size_t length, uint8_t *dst,
-              const uint8_t *src)
-{
-  assert(!(length % AES_BLOCK_SIZE) );
-  _aes_decrypt(_AES256_ROUNDS, ctx->keys, &_aes_decrypt_table,
+  _aes_decrypt(ctx, &_aes_decrypt_table,
               length, dst, src);
 }