[Mixmaster-devel] r929 - trunk/Mix/Src

[<co...@as...>]

Author: colin
Date: 2006-03-08 10:25:18 +0100 (Wed, 08 Mar 2006)
New Revision: 929

Modified:
   trunk/Mix/Src/keymgt.c
   trunk/Mix/Src/mix3.h
Log:
parameterised key Id length as KEY_ID_LEN


Modified: trunk/Mix/Src/keymgt.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/Src/keymgt.c	2006-03-03 14:35:36 UTC (rev 928)
+++ trunk/Mix/Src/keymgt.c	2006-03-08 09:25:18 UTC (rev 929)
@@ -39,7 +39,7 @@
 {
   FILE *keyring;
   BUFFER *iv, *pass, *temp;
-  char idstr[34];
+  char idstr[KEY_ID_LEN+2];
   char line[LINELEN];
   int err =3D -1;
   char *res;
@@ -78,7 +78,7 @@
 	} while ( res !=3D NULL && strchr(line, ':') !=3D NULL );
 	if (res =3D=3D NULL)
 	  break;
-	if (keyid && (strncmp(line, idstr, 32) !=3D 0))
+	if (keyid && (strncmp(line, idstr, KEY_ID_LEN) !=3D 0))
 	  continue;
 	if (created !=3D 0 && (created > time(NULL))) {
 	  errlog(ERRORMSG, "Key is not valid yet (creation date in the future):=
 %s", idstr);
@@ -126,7 +126,7 @@
 {
   FILE *keyring;
   BUFFER *b, *temp, *iv;
-  char idstr[34];
+  char idstr[KEY_ID_LEN+2];
   char line[LINELEN];
   int err =3D 0;
=20
@@ -149,7 +149,7 @@
 	line[strlen(line)-1] =3D '\0';
       if ((strlen(line) > 0) && (line[strlen(line)-1] =3D=3D '\r'))
 	line[strlen(line)-1] =3D '\0';
-      if (strncmp(line, idstr, 32) !=3D 0)
+      if (strncmp(line, idstr, KEY_ID_LEN) !=3D 0)
 	continue;
       fgets(line, sizeof(line), keyring);	/* ignore length */
       for (;;) {

Modified: trunk/Mix/Src/mix3.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/Src/mix3.h	2006-03-03 14:35:36 UTC (rev 928)
+++ trunk/Mix/Src/mix3.h	2006-03-08 09:25:18 UTC (rev 929)
@@ -209,6 +209,7 @@
 int digest_sha1(BUFFER *b, BUFFER *md);
 int digest_rmd160(BUFFER *b, BUFFER *md);
=20
+#define KEY_ID_LEN 32
 int keymgt(int force);
 int key(BUFFER *b);
 int adminkey(BUFFER *b);