* configure.ac: Use assembler file arcfour-crypt.asm if available.

* arcfour.c (arcfour_crypt): Moved function too...
* arcfour-crypt.c (arcfour_crypt): New file.

Rev: src/nettle/Makefile.am:1.69
Rev: src/nettle/arcfour-crypt.c:1.1
Rev: src/nettle/arcfour.c:1.5
Rev: src/nettle/configure.ac:1.29

diff --git a/Makefile.am b/Makefile.am
index e9510dca0edbf89b74e2eee826f0b8cf6c46be9e..b89f720492ec91a40b471efc4639398289eda9b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ libnettle_a_SOURCES = aes.c aes.h aes-internal.h \
                      aes-decrypt-table.c aes-decrypt.c \
                      aes-encrypt-table.c aes-encrypt.c \
                      aes-set-encrypt-key.c aes-set-decrypt-key.c aes-meta.c \
-                     arcfour.c arcfour.h arcfour-meta.c \
+                     arcfour.c arcfour.h arcfour-crypt.c arcfour-meta.c \
                      base16-encode.c base16-decode.c base16-meta.c \
                       base64-encode.c base64-decode.c base64-meta.c base64.h \
                      cast128.c cast128.h cast128_sboxes.h cast128-meta.c \

diff --git a/arcfour-crypt.c b/arcfour-crypt.c
new file mode 100644 (file)
index 0000000..e3d678f
--- /dev/null
+++ b/arcfour-crypt.c
@@ -0,0 +1,52 @@
+/* arcfour-crypt.c
+ *
+ * The arcfour/rc4 stream cipher.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2001, 2004 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., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
+#include "arcfour.h"
+
+void
+arcfour_crypt(struct arcfour_ctx *ctx,
+             unsigned length, uint8_t *dst,
+             const uint8_t *src)
+{
+  register uint8_t i, j;
+  register int si, sj;
+
+  i = ctx->i; j = ctx->j;
+  while(length--)
+    {
+      i++; i &= 0xff;
+      si = ctx->S[i];
+      j += si; j &= 0xff;
+      sj = ctx->S[i] = ctx->S[j];
+      *dst++ = *src++ ^ ctx->S[ (si + sj) & 0xff ];
+    }
+  ctx->i = i; ctx->j = j;
+}

diff --git a/arcfour.c b/arcfour.c
index d5424348eecde3420f8ff76d734152098b4e4f0e..da0394289166c937b2b1bed57b2f086e7e79ba28 100644 (file)
--- a/arcfour.c
+++ b/arcfour.c
@@ -56,27 +56,6 @@ arcfour_set_key(struct arcfour_ctx *ctx,
   ctx->i = ctx->j = 0;
 }
 
-
-void
-arcfour_crypt(struct arcfour_ctx *ctx,
-             unsigned length, uint8_t *dst,
-             const uint8_t *src)
-{
-  register uint8_t i, j;
-  register int si, sj;
-
-  i = ctx->i; j = ctx->j;
-  while(length--)
-    {
-      i++; i &= 0xff;
-      si = ctx->S[i];
-      j += si; j &= 0xff;
-      sj = ctx->S[i] = ctx->S[j];
-      *dst++ = *src++ ^ ctx->S[ (si + sj) & 0xff ];
-    }
-  ctx->i = i; ctx->j = j;
-}
-
 void
 arcfour_stream(struct arcfour_ctx *ctx,
               unsigned length, uint8_t *dst)

diff --git a/configure.ac b/configure.ac
index 4bd15fcf54d3d328b6426249ab7d12ca184bbfac..3a87e64c3f144e02a2c2c0ae91f315a30c2be47a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,8 @@ if test "x$enable_assembler" = xyes ; then
   if test -n "$asm_path"; then
     AC_MSG_NOTICE([Looking for assembler files in $asm_path/.])
     found=no
-    for tmp_f in aes.asm aes-encrypt.asm aes-decrypt.asm machine.m4; do
+    for tmp_f in aes.asm aes-encrypt.asm aes-decrypt.asm \
+                arcfour-crypt.asm machine.m4; do
 #       echo "Looking for $srcdir/$asm_path/$tmp_f"
       if test -f "$srcdir/$asm_path/$tmp_f"; then
 #        echo found