* Added twofish implementation.

Rev: src/nettle/twofish.c:1.1
Rev: src/nettle/twofish.h:1.1

diff --git a/twofish.c b/twofish.c
index 31f5ff2561f3345ae0242b1f8345ff9add4fdb3e..6450b1c5a5fc9a54aed63c1c7a9a3af6d2355272 100644 (file)
--- a/twofish.c
+++ b/twofish.c
@@ -1,48 +1,37 @@
 /* twofish.c
  *
- * $Id$
+ * The twofish block cipher.
  */
-  
+
 /* twofish - An implementation of the twofish cipher.
  * Copyright (C) 1999 Ruud de Rooij <ruud@debian.org>
  *
  * Modifications for lsh, integrated testing
  * Copyright (C) 1999 J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Integrated with the nettle library,
+ * Copyright (C) 2001 Niels Möller
  */
 
-/* ------------------------------------------------------------------------- */
-
-#include "twofish.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-static char cvs_id[] UNUSED =
-"$Id$";
-
-/* ------------------------------------------------------------------------- */
-
-/* Type definitions for byte and word.  word refers to a 32-bit unsigned
- * value.
+/* nettle, low-level cryptographics library
+ *
+ * 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 GNU MP 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 GNU MP Library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
  */
 
-typedef UINT8 byte;
-typedef UINT32 word;
+#include "twofish.h"
 
 /* Bitwise rotations on 32-bit words.  These are defined as macros that
  * evaluate their argument twice, so do not apply to any expressions with

diff --git a/twofish.h b/twofish.h
new file mode 100644 (file)
index 0000000..0b4c6ef
--- /dev/null
+++ b/twofish.h
@@ -0,0 +1,65 @@
+/* twofish.h
+ *
+ * The twofish block cipher.
+ */
+
+/* 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 GNU MP Library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+/*
+ * Twofish is a 128-bit block cipher that accepts a variable-length
+ * key up to 256 bits, designed by Bruce Schneier and others.  See
+ * http://www.counterpane.com/twofish.html for details.
+ */
+
+#ifndef NETTLE_TWOFISH_H_INCLUDED
+#define NETTLE_TWOFISH_H_INCLUDED
+
+#include <stdint.h>
+
+#define TWOFISH_BLOCK_SIZE 16
+
+/* Variable key size between 128 and 256 bits. But the only valid
+ * values are 16 (128 bits), 24 (192 bits) and 32 (256 bits). */
+#define TWOFISH_MIN_KEY_SIZE 16
+#define TWOFISH_MAX_KEY_SIZE 32
+
+#define TWOFISH_KEY_SIZE 32
+
+struct twofish_ctx
+{
+  uint32_t keys[40];
+  uitn32_t s_box[4][256];
+};
+
+void
+twofish_set_key(struct twofish_ctx *ctx,
+               unsigned length, const uint8_t *key);
+
+void
+twofish_encrypt(struct twofish_ctx *ctx,
+               unsigned length, uint8_t *dst,
+               const uint8_t *src);
+void
+twofish_decrypt(struct twofish_ctx *ctx,
+               unsigned length, uint8_t *dst,
+               const uint8_t *src);
+
+#endif /* NETTLE_TWOFISH_H_INCLUDED */