[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
shishi/lib crypto-rc4.c nettle.c
From: |
shishi-commit |
Subject: |
shishi/lib crypto-rc4.c nettle.c |
Date: |
Fri, 19 Sep 2003 20:03:39 -0400 |
CVSROOT: /cvsroot/shishi
Module name: shishi
Branch:
Changes by: Simon Josefsson <address@hidden> 03/09/19 20:03:38
Modified files:
lib : crypto-rc4.c nettle.c
Log message:
Fix ARCFOUR.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto-rc4.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/nettle.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: shishi/lib/crypto-rc4.c
diff -u shishi/lib/crypto-rc4.c:1.9 shishi/lib/crypto-rc4.c:1.10
--- shishi/lib/crypto-rc4.c:1.9 Fri Sep 19 16:29:06 2003
+++ shishi/lib/crypto-rc4.c Fri Sep 19 20:03:38 2003
@@ -302,6 +302,11 @@
if (err)
goto done;
+ if (VERBOSECRYPTO (handle))
+ {
+ puts ("cksum pt"); _shishi_hexprint (pt, inlen - 16);
+ }
+
err = shishi_hmac_md5 (handle, K2, 16, pt, inlen - 16, &cksum);
if (err)
goto done;
Index: shishi/lib/nettle.c
diff -u shishi/lib/nettle.c:1.11 shishi/lib/nettle.c:1.12
--- shishi/lib/nettle.c:1.11 Fri Sep 19 19:49:59 2003
+++ shishi/lib/nettle.c Fri Sep 19 20:03:38 2003
@@ -148,11 +148,9 @@
/*
* The following function was extracted from RFC 1952 by Simon
- * Josefsson, for the Shishi project, and modified to be compatible
- * with the modified CRC-32 used by RFC 1510, and subsequently
- * modified for GNU Libgcrypt to allow it to be used for calculating
- * both unmodified CRC-32 and modified CRC-32 values. Original
- * copyright and notice from the document follows:
+ * Josefsson, and modified to be compatible with the modified CRC-32
+ * used by RFC 1510, for the Shishi project. Original copyright and
+ * notice from the document follows:
*
* Copyright (c) 1996 L. Peter Deutsch
*
@@ -400,12 +398,11 @@
char **out)
{
struct arcfour_ctx ctx;
- int rc;
*out = xmalloc (inlen);
arcfour_set_key (&ctx, keylen, key);
- arcfour_crypt (&ctx, inlen, in, *out);
+ arcfour_crypt (&ctx, inlen, *out, in);
return SHISHI_OK;
}
- shishi/lib crypto-rc4.c nettle.c,
shishi-commit <=