[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gc-arcfour and gc-arcfour-tests
From: |
Simon Josefsson |
Subject: |
gc-arcfour and gc-arcfour-tests |
Date: |
Wed, 19 Oct 2005 17:04:26 +0200 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) |
I have installed this too.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/ChangeLog,v
retrieving revision 1.431
diff -u -p -r1.431 ChangeLog
--- ChangeLog 19 Oct 2005 14:54:32 -0000 1.431
+++ ChangeLog 19 Oct 2005 15:04:08 -0000
@@ -1,5 +1,11 @@
2005-10-19 Simon Josefsson <address@hidden>
+ * tests/test-gc-arcfour.c: New file.
+
+ * modules/gc-arcfour, modules/gc-arcfour-tests: New files.
+
+2005-10-19 Simon Josefsson <address@hidden>
+
* tests/test-gc-rijndael.c: New file.
* modules/gc-rijndael, modules/gc-rijndael-test: New files.
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v
retrieving revision 1.1023
diff -u -p -r1.1023 ChangeLog
--- lib/ChangeLog 19 Oct 2005 14:54:32 -0000 1.1023
+++ lib/ChangeLog 19 Oct 2005 15:04:09 -0000
@@ -1,5 +1,9 @@
2005-10-19 Simon Josefsson <address@hidden>
+ * gc-gnulib.c: Support ARCFOUR.
+
+2005-10-19 Simon Josefsson <address@hidden>
+
* gc-gnulib.c: Implement gc_cipher_* API, currently only with AES
support.
Index: lib/gc-gnulib.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/gc-gnulib.c,v
retrieving revision 1.9
diff -u -p -r1.9 gc-gnulib.c
--- lib/gc-gnulib.c 19 Oct 2005 14:54:32 -0000 1.9
+++ lib/gc-gnulib.c 19 Oct 2005 15:04:09 -0000
@@ -37,6 +37,7 @@
#include <fcntl.h>
#include <errno.h>
+/* Hashes. */
#ifdef GC_USE_MD4
# include "md4.h"
#endif
@@ -49,6 +50,11 @@
#ifdef GC_USE_HMAC_MD5
# include "hmac.h"
#endif
+
+/* Ciphers. */
+#ifdef GC_USE_ARCFOUR
+# include "arcfour.h"
+#endif
#ifdef GC_USE_RIJNDAEL
# include "rijndael-api-fst.h"
#endif
@@ -152,6 +158,9 @@ gc_set_allocators (gc_malloc_t func_mall
typedef struct _gc_cipher_ctx {
Gc_cipher alg;
Gc_cipher_mode mode;
+#ifdef GC_USE_ARCFOUR
+ arcfour_context arcfourContext;
+#endif
#ifdef GC_USE_RIJNDAEL
rijndaelKeyInstance aesEncKey;
rijndaelKeyInstance aesDecKey;
@@ -173,6 +182,20 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher
switch (alg)
{
+#ifdef GC_USE_ARCFOUR
+ case GC_ARCFOUR128:
+ case GC_ARCFOUR40:
+ switch (mode)
+ {
+ case GC_STREAM:
+ break;
+
+ default:
+ rc = GC_INVALID_CIPHER;
+ }
+ break;
+#endif
+
#ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
@@ -208,6 +231,13 @@ gc_cipher_setkey (gc_cipher_handle handl
switch (ctx->alg)
{
+#ifdef GC_USE_ARCFOUR
+ case GC_ARCFOUR128:
+ case GC_ARCFOUR40:
+ arcfour_setkey (&ctx->arcfourContext, key, keylen);
+ break;
+#endif
+
#ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
@@ -297,6 +327,13 @@ gc_cipher_encrypt_inline (gc_cipher_hand
switch (ctx->alg)
{
+#ifdef GC_USE_ARCFOUR
+ case GC_ARCFOUR128:
+ case GC_ARCFOUR40:
+ arcfour_stream (&ctx->arcfourContext, data, data, len);
+ break;
+#endif
+
#ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
@@ -326,6 +363,13 @@ gc_cipher_decrypt_inline (gc_cipher_hand
switch (ctx->alg)
{
+#ifdef GC_USE_ARCFOUR
+ case GC_ARCFOUR128:
+ case GC_ARCFOUR40:
+ arcfour_stream (&ctx->arcfourContext, data, data, len);
+ break;
+#endif
+
#ifdef GC_USE_RIJNDAEL
case GC_AES128:
case GC_AES192:
Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/ChangeLog,v
retrieving revision 1.749
diff -u -p -r1.749 ChangeLog
--- m4/ChangeLog 19 Oct 2005 14:54:32 -0000 1.749
+++ m4/ChangeLog 19 Oct 2005 15:04:09 -0000
@@ -1,5 +1,7 @@
2005-10-19 Simon Josefsson <address@hidden>
+ * gc-arcfour.m4: New file.
+
* gc-rijndael.m4: New file.
2005-10-19 Simon Josefsson <address@hidden>
Index: m4/gc-arcfour.m4
===================================================================
RCS file: m4/gc-arcfour.m4
diff -N m4/gc-arcfour.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ m4/gc-arcfour.m4 19 Oct 2005 15:04:09 -0000
@@ -0,0 +1,15 @@
+# gc-arcfour.m4 serial 1
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_GC_ARCFOUR],
+[
+ AC_REQUIRE([gl_GC])
+ AC_DEFINE(GC_USE_ARCFOUR, 1,
+ [Define if you want to support ARCFOUR through GC.])
+ if test "$ac_cv_libgcrypt" != yes; then
+ gl_ARCFOUR
+ fi
+])
Index: modules/gc-arcfour
===================================================================
RCS file: modules/gc-arcfour
diff -N modules/gc-arcfour
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/gc-arcfour 19 Oct 2005 15:04:09 -0000
@@ -0,0 +1,26 @@
+Description:
+Generic crypto wrappers for ARCFOUR stream cipher.
+
+Files:
+m4/gc-arcfour.m4
+lib/arcfour.h
+lib/arcfour.c
+m4/arcfour.m4
+
+Depends-on:
+stdint
+gc
+
+configure.ac:
+gl_GC_ARCFOUR
+
+Makefile.am:
+
+Include:
+"gc.h"
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson
Index: modules/gc-arcfour-tests
===================================================================
RCS file: modules/gc-arcfour-tests
diff -N modules/gc-arcfour-tests
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/gc-arcfour-tests 19 Oct 2005 15:04:09 -0000
@@ -0,0 +1,11 @@
+Files:
+tests/test-gc-arcfour.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-gc-arcfour
+noinst_PROGRAMS += test-gc-arcfour
+test_gc_arcfour_SOURCES = test-gc-arcfour.c
Index: tests/test-gc-arcfour.c
===================================================================
RCS file: tests/test-gc-arcfour.c
diff -N tests/test-gc-arcfour.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/test-gc-arcfour.c 19 Oct 2005 15:04:09 -0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2005 Free Software Foundation
+ * Written by Simon Josefsson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program 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 a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include "gc.h"
+
+int
+main (int argc, char *argv[])
+{
+ gc_cipher_handle ctx;
+ /* Test vector from Cryptlib via Libgcrypt labeled there: "from the
+ State/Commerce Department". */
+ static char key_1[] = { 0x61, 0x8A, 0x63, 0xD2, 0xFB };
+ static char plaintext_1[] = { 0xDC, 0xEE, 0x4C, 0xF9, 0x2C };
+ static const char ciphertext_1[] = { 0xF1, 0x38, 0x29, 0xC9, 0xDE };
+ char scratch[16];
+ Gc_rc rc;
+
+ rc = gc_init ();
+ if (rc != GC_OK)
+ {
+ printf ("gc_init() failed\n");
+ return 1;
+ }
+
+ rc = gc_cipher_open (GC_ARCFOUR40, GC_STREAM, &ctx);
+ if (rc != GC_OK)
+ return 1;
+
+ rc = gc_cipher_setkey (ctx, sizeof (key_1), key_1);
+ if (rc != GC_OK)
+ return 1;
+
+ memcpy (scratch, plaintext_1, sizeof (plaintext_1));
+ rc = gc_cipher_encrypt_inline (ctx, sizeof (plaintext_1), scratch);
+ if (rc != GC_OK)
+ return 1;
+
+ if (memcmp (scratch, ciphertext_1, sizeof (ciphertext_1)))
+ {
+ size_t i;
+ printf ("expected:\n");
+ for (i = 0; i < 5; i++)
+ printf ("%02x ", scratch[i] & 0xFF);
+ printf ("\ncomputed:\n");
+ for (i = 0; i < 5; i++)
+ printf ("%02x ", ciphertext_1[i] & 0xFF);
+ printf ("\n");
+ return 1;
+ }
+
+ /* decrypt */
+
+ rc = gc_cipher_setkey (ctx, sizeof (key_1), key_1);
+ if (rc != GC_OK)
+ return 1;
+
+ rc = gc_cipher_decrypt_inline (ctx, sizeof (plaintext_1), scratch);
+ if (rc != GC_OK)
+ return 1;
+
+ if (memcmp (scratch, plaintext_1, sizeof (plaintext_1)))
+ {
+ size_t i;
+ printf ("expected:\n");
+ for (i = 0; i < 5; i++)
+ printf ("%02x ", plaintext_1[i] & 0xFF);
+ printf ("\ncomputed:\n");
+ for (i = 0; i < 5; i++)
+ printf ("%02x ", scratch[i] & 0xFF);
+ printf ("\n");
+ return 1;
+ }
+
+ gc_done ();
+
+ return 0;
+}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gc-arcfour and gc-arcfour-tests,
Simon Josefsson <=