[Mixmaster-devel] rev 644 - trunk/Mix/Src

[<we...@so...>]

Author: weasel
Date: 2003-10-26 01:13:56 +0200 (Sun, 26 Oct 2003)
New Revision: 644

Removed:
   trunk/Mix/Src/chain3.c
   trunk/Mix/Src/rem3.c
Modified:
   trunk/Mix/Src/Makefile.am
   trunk/Mix/Src/mix3.h
   trunk/Mix/Src/rem.c
Log:
Remove any traces of the (back then) planned new packet format for mix3

Modified: trunk/Mix/Src/Makefile.am
===================================================================
--- trunk/Mix/Src/Makefile.am	2003-10-25 22:26:39 UTC (rev 643)
+++ trunk/Mix/Src/Makefile.am	2003-10-25 23:13:56 UTC (rev 644)
@@ -6,7 +6,7 @@
 	nym.c        pgpdb.c     rem1.c      service.c chain1.c\
 	crypto.h    main.c     mime.c      parsedate.y  pgpget.c\
 	rem2.c      stats.c chain2.c   menu.c     mix.c\
-	pgp.c        rem3.c      util.c chain3.c   menu.h\
+	pgp.c        util.c menu.h\
 	mix.h       pgp.h        pool.c      version.h
 # mixmaster_LDADD = 
 

Deleted: trunk/Mix/Src/chain3.c
===================================================================
--- trunk/Mix/Src/chain3.c	2003-10-25 22:26:39 UTC (rev 643)
+++ trunk/Mix/Src/chain3.c	2003-10-25 23:13:56 UTC (rev 644)
@@ -1,22 +0,0 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
-
-   Mixmaster may be redistributed and modified under certain conditions.
-   This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
-   ANY KIND, either express or implied. See the file COPYRIGHT for
-   details.
-
-   Encrypt Mixmaster v3 messages
-   $Id: chain3.c,v 1.1 2001/10/31 08:19:53 rabbi Exp $ */
-
-
-#include "mix3.h"
-
-int mix3_rlist()
-{
-  NOT_IMPLEMENTED;
-}
-
-int mix3_encrypt()
-{
-  NOT_IMPLEMENTED;
-}

Modified: trunk/Mix/Src/mix3.h
===================================================================
--- trunk/Mix/Src/mix3.h	2003-10-25 22:26:39 UTC (rev 643)
+++ trunk/Mix/Src/mix3.h	2003-10-25 23:13:56 UTC (rev 644)
@@ -361,13 +361,11 @@
 int t2_decrypt(BUFFER *in);
 
 int mix2_decrypt(BUFFER *m);
-int mix3_decrypt(BUFFER *m);
 
 /* type 2 */
 #define MAGIC0 0
 #define MAGIC1 3
 
-int v3_magic(byte *b);
 int v2body(BUFFER *body);
 int v2body_setlen(BUFFER *body);
 int v2partial(BUFFER *body, BUFFER *mid, int packet, int numpackets);

Modified: trunk/Mix/Src/rem.c
===================================================================
--- trunk/Mix/Src/rem.c	2003-10-25 22:26:39 UTC (rev 643)
+++ trunk/Mix/Src/rem.c	2003-10-25 23:13:56 UTC (rev 644)
@@ -332,10 +332,7 @@
   do {
     err = mix_dearmor(in, msg);
     if (err != -1) {
-      if (v3_magic(msg->data))
-	err = mix3_decrypt(msg);
-      else
-	err = mix2_decrypt(msg);
+      err = mix2_decrypt(msg);
     }
   }
   while (in->ptr + 1000 < in->length);	/* accept several packets in one message */

Deleted: trunk/Mix/Src/rem3.c
===================================================================
--- trunk/Mix/Src/rem3.c	2003-10-25 22:26:39 UTC (rev 643)
+++ trunk/Mix/Src/rem3.c	2003-10-25 23:13:56 UTC (rev 644)
@@ -1,22 +0,0 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
-
-   Mixmaster may be redistributed and modified under certain conditions.
-   This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
-   ANY KIND, either express or implied. See the file COPYRIGHT for
-   details.
-
-   Process Mixmaster 3 remailer messages
-   $Id: rem3.c,v 1.1 2001/10/31 08:19:53 rabbi Exp $ */
-
-
-#include "mix3.h"
-
-int v3_magic(byte *b)
-{
-  return (b[0] == MAGIC0 && b[1] == MAGIC1);
-}
-
-int mix3_decrypt(BUFFER *m)
-{
-  NOT_IMPLEMENTED;
-}