Mixmaster

Hi,

i've made some little patch to mixmaster 2.9.1 to fix some bug, but i'm
not really familiar with the code, so i don't know if all it is ok.

I have to ask to the developers some question abuot my patches
(referenced with sourceforge number):

- 873497 prngpad
  In an old mail Disastry said that the usage of the random entropy pool
  to fill messages with garbage can be a problem, because if the entropy
  pool begin empty, the cryptographic functions may be slow down or more
  predictable.
  That patch use the RAND_pseudo_bytes() function to generate garbage in
  the body of type I messages, as well in the buf_pad() function for body
  and headers of type II messages.
  I'm not a cryptography expert, so i don't know if may be a problem to
  use pseudo random bytes in the mixmaster headers. I think that Ulf
  Möller can tell the correct thing. Probably the correct way is to
  use RAND_pseudo_bytes() only to fill message bodies.

- 873498 confirm
  This patch request a random confirm string to the email that should be
  blocked and will block the address only when it received the confirm.
  I don't know if the split of blockrequest() that i've made is correct.
  Also there is some code doubled in confirmrequest(): should i try to
  find a better way to parse a common type of request "COMMAND ARGUMENT"?
  Should i readd the domain blocking too?

- [not yet finished] bounce
  This patch should bounce a message when mixmaster can't add a new
  temporary file to the pool (ex. disk full, bug 628703). My problem is
  that i know if the message can be added in mix_pool(), before isnewid()
  was called, so if the message bounce it will be rejected when it will be
  resent. Should i split isnewid()? what is the preferred way to maintain
  the lock?
  This is only the start to fix the 703770 bug, because there are others
  possible point of failure when writing pool files. Someone have some
  idea about the way to correct this? I must find a way to be sure that a
  file can be copied/decripted to a new one before to unlink it.

I've made another patch (877312) for doallow() to check all the addresses
on the line that should be good and the mpgp man page (bug 585054) that
can contains many english typos.

If the coding style and comments are ok, i will do some minor fix and make
tests on these patchs to be sure that they not contains bugs. Also if some
patch should go in the 3.0 branch only i will adapt to it.

Thank for your time :-)

3		http://www.trek.eu.org/
k		PGPKey: 7016731A57D4A69B 1A8EE5E90EF2608E (since 1995)

Bugs item #884395, was opened at 2004-01-25 13:32
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423727&aid=884395&group_id=37891

Category: General
Group: None
Status: Open
Resolution: None
Priority: 5
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: PGP code signing key is expired

Initial Comment:
$ gpg --verify mixmaster-2.9.1.tar.gz.sig
mixmaster-2.9.1.tar.gz    gpg: Signature made Sun Nov 
9 12:08:58 2003 CET using DSA key ID 9260849A
gpg: Good signature from "Mixmaster Code Release
Signing Key 2003"
gpg: Note: This key has expired!


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423727&aid=884395&group_id=37891

Author: dybbuk
Date: 2004-01-22 01:23:29 +0100 (Thu, 22 Jan 2004)
New Revision: 712

Modified:
   trunk/Mix/mixmaster.1
Log:
Fixed a typo in the manpage: id.log is not KEYFILE in mix.cfg.


Modified: trunk/Mix/mixmaster.1
===================================================================
--- trunk/Mix/mixmaster.1	2004-01-21 00:57:57 UTC (rev 711)
+++ trunk/Mix/mixmaster.1	2004-01-22 00:23:29 UTC (rev 712)
@@ -1005,7 +1005,7 @@
 The public type 2 remailer key (\fBKEYFILE\fP).
 .TP
 .B id.log
-Log file of messages already processed (\fBKEYFILE\fP).
+Log file of messages already processed (\fBIDLOG\fP).
 .TP
 .B stats.log
 Log file for remailer statistics (\fBSTATS\fP).

The program for CodeCon 2004 has been announced.

http://www.codecon.org/2004/program.html

CodeCon is the premier showcase of active hacker projects. It is a
workshop for developers of real-world applications with working code and
active development projects. All presentations will given by one of the
active developers, and accompanied by a functional demo.

Highlights of CodeCon 2004 include:

PGP Universal - Automatic, transparent email encryption with zero clicks
Osiris -        A free Host Integrity Monitor designed for large scale
                server deployments that require auditable security
Tor -           Second-generation Onion Routing: a TCP-based anonymizing
                overlay network
Vesta -         An advanced software configuration management system that
                handles both versioning source files and building
PETmail -       Permission-based anti-spam replacement for SMTP
FunFS -         Fast User Network File System - An advanced network file
                system designed as a successor for NFS
Codeville -     Distributed version control system
Audacity -      A cross-platform multi-track audio editor


The third annual CodeCon takes place February 20 - 22, noon - 6pm, at Club
NV (525 Howard Street) in San Francisco. CodeCon registration is $95; a
$20 discount is available for attendees who register online prior to
February 1, 2004.

http://www.codecon.org/2004/registration.html

Author: weasel
Date: 2004-01-21 01:57:57 +0100 (Wed, 21 Jan 2004)
New Revision: 711

Modified:
   trunk/Mix/Src/mpgp.c
Log:
Set keyword expansion for Id on mpgp.c


Property changes on: trunk/Mix/Src/mpgp.c
___________________________________________________________________
Name: svn:keywords
   + Id

Author: rabbi
Date: 2004-01-21 01:47:21 +0100 (Wed, 21 Jan 2004)
New Revision: 710

Modified:
   trunk/Mix/COPYRIGHT
   trunk/Mix/HISTORY
   trunk/Mix/Install
   trunk/Mix/README
   trunk/Mix/Src/buffers.c
   trunk/Mix/Src/chain.c
   trunk/Mix/Src/chain1.c
   trunk/Mix/Src/chain2.c
   trunk/Mix/Src/compress.c
   trunk/Mix/Src/config.h
   trunk/Mix/Src/crypto.c
   trunk/Mix/Src/crypto.h
   trunk/Mix/Src/dllmain.c
   trunk/Mix/Src/keymgt.c
   trunk/Mix/Src/mail.c
   trunk/Mix/Src/maildir.c
   trunk/Mix/Src/main.c
   trunk/Mix/Src/menu.c
   trunk/Mix/Src/menu.h
   trunk/Mix/Src/menunym.c
   trunk/Mix/Src/menusend.c
   trunk/Mix/Src/menuutil.c
   trunk/Mix/Src/mime.c
   trunk/Mix/Src/mix.c
   trunk/Mix/Src/mix.h
   trunk/Mix/Src/mix3.h
   trunk/Mix/Src/mpgp.c
   trunk/Mix/Src/nym.c
   trunk/Mix/Src/pgp.c
   trunk/Mix/Src/pgp.h
   trunk/Mix/Src/pgpcreat.c
   trunk/Mix/Src/pgpdata.c
   trunk/Mix/Src/pgpdb.c
   trunk/Mix/Src/pgpget.c
   trunk/Mix/Src/pool.c
   trunk/Mix/Src/random.c
   trunk/Mix/Src/rem.c
   trunk/Mix/Src/rem1.c
   trunk/Mix/Src/rem2.c
   trunk/Mix/Src/remailer.c
   trunk/Mix/Src/rfc822.c
   trunk/Mix/Src/rndseed.c
   trunk/Mix/Src/stats.c
   trunk/Mix/Src/util.c
   trunk/Mix/conf/dest.alw
   trunk/Mix/conf/mix.cfg.ex
   trunk/Mix/mixmaster.1
Log:
Updated copyright dates, doc issues, misc fixes.


Modified: trunk/Mix/COPYRIGHT
===================================================================
--- trunk/Mix/COPYRIGHT	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/COPYRIGHT	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,3 +1,10 @@
+Copyright (c) 1999-2004 Anonymizer Inc.
+Copyright (c) 2000-2002 Ulf Moeller
+Copyright (c) 2001-2002 Janis Jagars
+Copyright (c) 2001-2004 Peter Palfrader
+Copyright (c) 2001-2003 Len Sassaman
+
+
 MIXMASTER LICENSE AGREEMENT
 
 1. Grant of License.

Modified: trunk/Mix/HISTORY
===================================================================
--- trunk/Mix/HISTORY	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/HISTORY	2004-01-21 00:47:21 UTC (rev 710)
@@ -392,9 +392,10 @@
                            Drop messages without timestamps and messages with
                              future timestamps.  This abandons backwards
                              compatibility with Mixmaster 2.0.3 and earlier.
-                           Try to detect timeskews and refuse to run as a
-                             remailer if there is a problem suspected.  Only
-                             applies to mixmaster in remailer mode.
+                           Mixmaster attempts to detect system clock
+                             misconfigurations and refuses to run as a
+                             remailer if there is a problem suspected.
+                             Only applies to Mixmaster in remailer mode.
 
                            BUG FIXES:
 
@@ -431,6 +432,8 @@
                              well.
                            Messages to more than one remailer are dropped.
                            Nym support is not compiled in by default anymore.
+                           The OpenPGP module mpgp now includes a man
+                             page (contributed by Trek).
                            Ignore 'No reliable remailers' problems when
                              randhopping messages in middleman mode.
                              That is better than dropping them.
@@ -444,4 +447,3 @@
                              If the total number of hops (which cannot be
                              known) exceeds 20 the message is damanged
                              and will fail at the 20th node.
-

Modified: trunk/Mix/Install
===================================================================
--- trunk/Mix/Install	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Install	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Mixmaster version 3.0  --  (C) 1999-2003 Anonymizer Inc. and others.
+# Mixmaster version 3.0  --  (C) 1999-2004 Anonymizer Inc. and others.
 
 # Mixmaster may be redistributed and modified under certain conditions.
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
@@ -225,6 +225,9 @@
 ##########################################################################
 umask 077
 
+#FIXME -- Mixmaster now should be installed as root, and Install should
+#create a remailer user. /var/spool/mixmaster is a good home.
+
 if [ `whoami` = root ]
 then
  echo "Please create a new user, e.g, \`mix', and install Mixmaster under that
@@ -347,7 +350,7 @@
     echo "You can either compile your secret passphrase into the binary
 or you can set it in your config file. Note that the former does not
 really increase security as the passphrase can still be discovered by
-running something like \`strings mix'."
+running something like \`strings mixmaster'."
     echo ""
     echo "Most users should answer \`n' to this question:"
     echo ""
@@ -976,11 +979,15 @@
   fi
  fi
 
- echo "How many messages do you want to keep in the reordering pool?
-A larger pool is more secure, but also causes higher latency.
-0 means to remail immediately."
- readln "Pool size:" 20
- poolsize=$ans
+# Commented the poolsize question out, since poolsize is the least
+# important of the three pool parameters.
+#
+# echo "How many messages do you want to keep in the reordering pool?
+#A larger pool is more secure, but also causes higher latency.
+#0 means to remail immediately."
+# readln "Pool size:" 20
+# poolsize=$ans
+poolsize=25
 
  mbox=
  if [ -f ~/.forward ]
@@ -1055,11 +1062,11 @@
 MID		$mid
 
 # Remailing strategy:
-SENDPOOLTIME    1h
+SENDPOOLTIME    10m
 POOLSIZE        $poolsize
-RATE            95
-INDUMMYP        20
-OUTDUMMYP       67
+RATE            30
+INDUMMYP        3
+OUTDUMMYP       10
 IDEXP           7d
 PACKETEXP       7d
 
@@ -1138,7 +1145,10 @@
 umask 033
 
 # Set .forward?
+# 
 set=y
+# FIXME -- Mixmastger should run in daemon mode, not from procmail
+# Make the Install script do that.
 
 if grep procmail ~/.forward >/dev/null 2>/dev/null
 then
@@ -1188,6 +1198,9 @@
  fi
 fi
 
+#FIXME -- we need a second script that can re-generate help files
+# when the conf changes.
+
 if [ "$RMA" != "" ]
 then
  echo "

Modified: trunk/Mix/README
===================================================================
--- trunk/Mix/README	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/README	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,5 +1,5 @@
-Mixmaster version 3 -- anonymous remailer software -- (C) 1999 Anonymizer Inc.
-------------------------------------------------------------------------------
+Mixmaster 3.0 -- anonymous remailer software -- (C) 1999 - 2004 Anonymizer Inc.
+-------------------------------------------------------------------------------
 
 PREVIEW VERSION  ---  WARNING: THIS SOFTWARE IS UNDER DEVELOPMENT!
 
@@ -51,7 +51,7 @@
 
 Mixmaster uses lists of currently operating remailers and information
 about their reliability. You can get the current remailer lists from
-http://stats.melontraffickers.com/ and http://anon.efga.org/ and via
+http://stats.melontraffickers.com/ and http://www.noreply.org/ and via
 finger from nym.alias.net:
 
   pubring.asc    Type 1 remailer keys

Modified: trunk/Mix/Src/buffers.c
===================================================================
--- trunk/Mix/Src/buffers.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/buffers.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/chain.c
===================================================================
--- trunk/Mix/Src/chain.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/chain.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/chain1.c
===================================================================
--- trunk/Mix/Src/chain1.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/chain1.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/chain2.c
===================================================================
--- trunk/Mix/Src/chain2.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/chain2.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/compress.c
===================================================================
--- trunk/Mix/Src/compress.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/compress.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/config.h
===================================================================
--- trunk/Mix/Src/config.h	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/config.h	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/crypto.c
===================================================================
--- trunk/Mix/Src/crypto.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/crypto.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/crypto.h
===================================================================
--- trunk/Mix/Src/crypto.h	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/crypto.h	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/dllmain.c
===================================================================
--- trunk/Mix/Src/dllmain.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/dllmain.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/keymgt.c
===================================================================
--- trunk/Mix/Src/keymgt.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/keymgt.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/mail.c
===================================================================
--- trunk/Mix/Src/mail.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/mail.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/maildir.c
===================================================================
--- trunk/Mix/Src/maildir.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/maildir.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,3 +1,14 @@
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
+
+   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.
+
+   Maildir support routines
+   $Id: $ */
+
+
 /* Maildir support for Mixmaster 3 - see
    http://www.qmail.org/man/man5/maildir.html and
    http://cr.yp.to/proto/maildir.html
@@ -2,3 +13,4 @@
 
-   Added by drt@... - http://c0re.jp/
+   Added by and (C) 2001 Doobee R. Tzeck 
+   drt@... - http://c0re.jp/
 

Modified: trunk/Mix/Src/main.c
===================================================================
--- trunk/Mix/Src/main.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/main.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/menu.c
===================================================================
--- trunk/Mix/Src/menu.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/menu.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/menu.h
===================================================================
--- trunk/Mix/Src/menu.h	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/menu.h	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/menunym.c
===================================================================
--- trunk/Mix/Src/menunym.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/menunym.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/menusend.c
===================================================================
--- trunk/Mix/Src/menusend.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/menusend.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/menuutil.c
===================================================================
--- trunk/Mix/Src/menuutil.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/menuutil.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/mime.c
===================================================================
--- trunk/Mix/Src/mime.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/mime.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/mix.c
===================================================================
--- trunk/Mix/Src/mix.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/mix.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/mix.h
===================================================================
--- trunk/Mix/Src/mix.h	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/mix.h	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/mix3.h
===================================================================
--- trunk/Mix/Src/mix3.h	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/mix3.h	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/mpgp.c
===================================================================
--- trunk/Mix/Src/mpgp.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/mpgp.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,9 +1,14 @@
-/* Test application for OpenPGP features */
+/* mpgp version 0.3.0 -- (C) 2000 - 2004 Ulf Moeller and others.
 
-/* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+   mpgp 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. */
+   details.
 
+   Test application for OpenPGP features
+   $Id: mpgp.c $ */
+
+
 #include "mix3.h"
 #include "pgp.h"
 #include <stdlib.h>

Modified: trunk/Mix/Src/nym.c
===================================================================
--- trunk/Mix/Src/nym.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/nym.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pgp.c
===================================================================
--- trunk/Mix/Src/pgp.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pgp.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pgp.h
===================================================================
--- trunk/Mix/Src/pgp.h	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pgp.h	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pgpcreat.c
===================================================================
--- trunk/Mix/Src/pgpcreat.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pgpcreat.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pgpdata.c
===================================================================
--- trunk/Mix/Src/pgpdata.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pgpdata.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pgpdb.c
===================================================================
--- trunk/Mix/Src/pgpdb.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pgpdb.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pgpget.c
===================================================================
--- trunk/Mix/Src/pgpget.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pgpget.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/pool.c
===================================================================
--- trunk/Mix/Src/pool.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/pool.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/random.c
===================================================================
--- trunk/Mix/Src/random.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/random.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/rem.c
===================================================================
--- trunk/Mix/Src/rem.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/rem.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/rem1.c
===================================================================
--- trunk/Mix/Src/rem1.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/rem1.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/rem2.c
===================================================================
--- trunk/Mix/Src/rem2.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/rem2.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/remailer.c
===================================================================
--- trunk/Mix/Src/remailer.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/remailer.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/rfc822.c
===================================================================
--- trunk/Mix/Src/rfc822.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/rfc822.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/rndseed.c
===================================================================
--- trunk/Mix/Src/rndseed.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/rndseed.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/stats.c
===================================================================
--- trunk/Mix/Src/stats.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/stats.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/Src/util.c
===================================================================
--- trunk/Mix/Src/util.c	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/Src/util.c	2004-01-21 00:47:21 UTC (rev 710)
@@ -1,4 +1,4 @@
-/* Mixmaster version 3  --  (C) 1999 Anonymizer Inc.
+/* Mixmaster version 3.0  --  (C) 1999 - 2004 Anonymizer Inc. and others.
 
    Mixmaster may be redistributed and modified under certain conditions.
    This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF

Modified: trunk/Mix/conf/dest.alw
===================================================================
--- trunk/Mix/conf/dest.alw	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/conf/dest.alw	2004-01-21 00:47:21 UTC (rev 710)
@@ -29,7 +29,6 @@
 /@blackhole\.riot\.eu\.org$/
 /@nym\.cryptofortress\.com$/
 /@nym\.xganon\.com$/
-/@nym\.frogadmin\.yi\.org$/
 /@rodent\.frell\.eu\.org$/
 
 

Modified: trunk/Mix/conf/mix.cfg.ex
===================================================================
--- trunk/Mix/conf/mix.cfg.ex	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/conf/mix.cfg.ex	2004-01-21 00:47:21 UTC (rev 710)
@@ -75,13 +75,13 @@
 
 ## Remailing strategy:
 MAILINTIME          5m
-SENDPOOLTIME        1h
-POOLSIZE            20
-RATE                95
+SENDPOOLTIME        10m
+POOLSIZE            25
+RATE                30
 
 ## Dummy generation probabilities
-INDUMMYP            10 
-OUTDUMMYP           30 
+INDUMMYP            3
+OUTDUMMYP           10 
 
 ## How long to store packet IDs and incomplete message parts
 IDEXP               7d

Modified: trunk/Mix/mixmaster.1
===================================================================
--- trunk/Mix/mixmaster.1	2004-01-21 00:00:22 UTC (rev 709)
+++ trunk/Mix/mixmaster.1	2004-01-21 00:47:21 UTC (rev 710)
@@ -1058,7 +1058,7 @@
 .BR procmail (1),
 .BR sendmail (8).
 .SH COPYRIGHT
-(C) 1999 Anonymizer Inc.
+(C) 1999 - 2004 Anonymizer Inc. and others.
 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

Author: weasel
Date: 2004-01-21 01:00:22 +0100 (Wed, 21 Jan 2004)
New Revision: 709

Modified:
   trunk/web/htdocs/keys/8A277312.asc
Log:
Add ulf's sig

Modified: trunk/web/htdocs/keys/8A277312.asc
===================================================================
--- trunk/web/htdocs/keys/8A277312.asc	2004-01-19 22:19:23 UTC (rev 708)
+++ trunk/web/htdocs/keys/8A277312.asc	2004-01-21 00:00:22 UTC (rev 709)
@@ -43,6 +43,9 @@
 DXAzoSSIzHNY3YE1nMi084hGBBARAgAGBQJADDlhAAoJEIRLlllPaN2RD2gAnjcW
 04uxrzzC7nLEI1a+d6JSoI96AKDZQNj3mbIDZ0d+InyaPyy0c9hYM4hGBBARAgAG
 BQJADDJUAAoJEKy7FkvPc+xMQosAni9l0EZNWd9LTNZS2z68F5cdW/3+AJ9ucQhG
-1B41+BbgVU1tyPqJR5m2SQ==
-=tSAz
+1B41+BbgVU1tyPqJR5m2SYiiBBABAgAMBQJADaGIBYMByA6hAAoJEFjfPm788gt9
+j/YD/RDV2iQQ9pRcK4HPcUOlxCJf0FyUIDqJOtz4zA6bIB/S58wJoOf7aZNWT/GN
+mmRv5F05XA7HUJ/QNEXMqaEqXzNET+tn40E28MnfntXITwp4UEAdLa378Lh2CRhJ
+JTWTv3qSMj3u/Qo/jcNDIjaHLnHcMo7an7rvjK2Mp/nvZX6b
+=zrRY
 -----END PGP PUBLIC KEY BLOCK-----

Author: weasel
Date: 2004-01-19 23:19:23 +0100 (Mon, 19 Jan 2004)
New Revision: 708

Modified:
   trunk/web/htdocs/index.shtml
Log:
Add year to keynames

Modified: trunk/web/htdocs/index.shtml
===================================================================
--- trunk/web/htdocs/index.shtml	2004-01-19 22:17:10 UTC (rev 707)
+++ trunk/web/htdocs/index.shtml	2004-01-19 22:19:23 UTC (rev 708)
@@ -36,7 +36,7 @@
 <p>
 <!-- 2004 -->
 Releases of Mixmaster are signed by Len Sassaman using the <em>Mixmaster Code
-Release Signing Key</em> (<a href="keys/8A277312.asc"><code>8A277312</code></a>).
+Release Signing Key 2004</em> (<a href="keys/8A277312.asc"><code>8A277312</code></a>).
 
 <pre>
 pub  1024D/8A277312 2004-01-01 Mixmaster Code Release Signing Key 2004
@@ -55,7 +55,7 @@
 <!-- 2003 -->
 <h3>Releases in 2003</h3>
 Releases of Mixmaster in 2003 were signed by Len Sassaman using the <em>Mixmaster Code
-Release Signing Key</em> (<a href="keys/9260849A.asc"><code>9260849A</code></a>).
+Release Signing Key 2003</em> (<a href="keys/9260849A.asc"><code>9260849A</code></a>).
 
 <pre>
 pub  1024D/9260849A 2003-01-01 Mixmaster Code Release Signing Key 2003

Author: weasel
Date: 2004-01-19 23:17:10 +0100 (Mon, 19 Jan 2004)
New Revision: 707

Added:
   trunk/web/htdocs/keys/8A277312.asc
Modified:
   trunk/web/htdocs/index.shtml
Log:
Add new signing key

Modified: trunk/web/htdocs/index.shtml
===================================================================
--- trunk/web/htdocs/index.shtml	2004-01-19 03:32:57 UTC (rev 706)
+++ trunk/web/htdocs/index.shtml	2004-01-19 22:17:10 UTC (rev 707)
@@ -34,8 +34,27 @@
 <h2>Signing Releases</h2>
 
 <p>
+<!-- 2004 -->
+Releases of Mixmaster are signed by Len Sassaman using the <em>Mixmaster Code
+Release Signing Key</em> (<a href="keys/8A277312.asc"><code>8A277312</code></a>).
+
+<pre>
+pub  1024D/8A277312 2004-01-01 Mixmaster Code Release Signing Key 2004
+     Key fingerprint = 1252 1706 B89B F4DF 3001  32A6 328A 8C3B 8A27 7312
+</pre>
+
+This key is signed by Len Sassaman's key <a href="keys/5DE480FC.asc"><code>5DE480FC</code></a>
+(<code>B115 73A8 91A8 05DC B26D  CBEB 4A0A 8149 5DE4 80FC</code>), Lance Cottrell's key
+<a href="keys/4F68DD91.asc"><code>4F68DD91</code></a>
+(<code>5327 8E77 666A 91F3 7007  B357 844B 9659 4F68 DD91</code>) and several other people.
+
+<p>
+For a full list of signatures see <a href="http://keyserver.noreply.org/pks/lookup?search=0x8A277312&fingerprint=on&op=vindex">0x8A277312 on keyserver.noreply.org</a> or any other keyserver.
+
+
 <!-- 2003 -->
-Releases of Mixmaster are signed by Len Sassaman using the <em>Mixmaster Code
+<h3>Releases in 2003</h3>
+Releases of Mixmaster in 2003 were signed by Len Sassaman using the <em>Mixmaster Code
 Release Signing Key</em> (<a href="keys/9260849A.asc"><code>9260849A</code></a>).
 
 <pre>
@@ -48,20 +67,11 @@
 <a href="keys/4F68DD91.asc"><code>4F68DD91</code></a>
 (<code>5327 8E77 666A 91F3 7007  B357 844B 9659 4F68 DD91</code>) and several other people.
 
-<!--<pre>
-pub  1024D/9260849A 2003-01-01 Mixmaster Code Release Signing Key 2003
-sig!3       9260849A 2003-01-11   Mixmaster Code Release Signing Key 2003
-sig!3       5DE480FC 2003-01-11   Len Sassaman &lt;rabbi@...;
-sig!        FD3428B4 2003-01-11   Lucky Green &lt;shamrock@...;
-sig!        C9E1B2F1 2003-01-12   Bill Stewart 2047 keycert-only &lt;bill.stewart@...;
-sig!        CF73EC4C 2003-01-11   Will Price &lt;wprice@...;
-sig!        92694311 2003-01-12   bill.stewart at pobox.com 2001-2003 &lt;bill@...;
-sig!        4838D515 2003-01-12   Rodney Thayer &lt;rodney@...;
-sig!1       94C09C7F 2003-01-13   Peter Palfrader
-sig!        4F68DD91 2003-01-13   Lance Cottrell &lt;lcottrell@...;
-sig!1       2B48F6F5 2003-01-13   Ian Goldberg &lt;ian@...;
-</pre>-->
+<p>
+<em>Note: This key expired on January 1st 2004</em>
 
+
+<!-- 2002 -->
 <h3>Releases in 2002</h3>
 Releases of Mixmaster in 2002 were signed by Len Sassaman using the <em>Mixmaster Code
 Release Signing Key 2002</em> (<a href="keys/E99872D3.asc"><code>E99872D3</code></a>).

Added: trunk/web/htdocs/keys/8A277312.asc
===================================================================
--- trunk/web/htdocs/keys/8A277312.asc	2004-01-19 03:32:57 UTC (rev 706)
+++ trunk/web/htdocs/keys/8A277312.asc	2004-01-19 22:17:10 UTC (rev 707)
@@ -0,0 +1,48 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+mQGiBD/0fKkRBADwIbi8UbTCeighoeOS3JXwKV3FlMkxe51ciyINjnPeN95Fj8y1
+ovJIxJBQW8OHdS7NENODf9Afc5iGBiK5ESyxsIN+7pmgDempbVIZ26W7sb1N9wdZ
+mp9OQvfp/6pl7OrrJ8NpSviG1ZPems7KYf/UC9lWIfelYsKoHBj7HRShAwCgw4HN
+L9MRQ3Q5ejjK0QaYmoL/U5EEAMXjQ0uUa65mdxMtdZCDM85IdGzv9o27NoS/i13k
+QhzF9/XsZUA9tzKXclsbtHemPJ3BTdw4RISBegI1UOW/KxUSgreW4L2xIOal1wyb
+7DNMwK0xl2PCg7iK0Sdy1lFBL6trqwsooIXF5ryFYfap/evtErUJtvLWwvHm96ZL
+ibYyA/9yfP8xkzU6O2bsUo1FOnNIQ22zOwxEkC9MeD8h8U9p99lD8+UndrihiZoA
+n72oftVjKDbCMSMJAp2WdZ5nj3jUdF7BU347UrvRmmE1oQZHCQRnjYaq8gpu0k0M
+GR3+s31lwdN8jHeDu/7felgTOiA7wqlKpuppNRhW3GihmdRMjrQnTWl4bWFzdGVy
+IENvZGUgUmVsZWFzZSBTaWduaW5nIEtleSAyMDA0iGAEExECACAFAj/0fKkFCQHh
+M4AFCwcDAgEDFQIDAxYCAQIeAQIXgAAKCRAyiow7iidzEtgXAJ0WBBCejr7SVfeG
+sXZ5KYimsbLZvwCgprOWN3ZE3NT0RKaoHyf4ThdVtwGJAiIEEwECAAwFAkALE0MF
+gwHKnOYACgkQSgqBSV3kgPyB3Q/+K3w4D3PLz2DG+pfj/67MgGAD7Uso0cCyyEw5
+gO7y3hYhU0lqCnQvF4XlxzK/xB+G55FHVSxHPFRAnNm8t9OZXCX1UIOz/w5GVqM5
+5zs3CGd7XV73wore3qoSYllvQ7HbdXw5JqVtWCu5KuCp+jTIQiIGYR+vQ1EMHAlI
+lPE7tFtrkfqra84R6r4AK345hoB7sQ2NY+KHyTyYjVMxCpejihmDIw0qVaMZL0YN
+5gwfMNgSXapu8OVmIqeHnoJNYU3OoB0MCXJwU5/WJKlJ89yjKE48qwYVgJIetHNG
+HClm922fOEaaBLyRHXMraSNMxIAz3p4OroFv+5kWgv8cZPWI2ftevHxfti19shLn
+KSbd4D9LdJ5RLo49F1OrUOAl0NlHVuWGk+RtUOjh/niMW1SQARQk30Ma/BofpT8/
+pPigBWQbWa++UcQL8/6Tvtm+spfXY+88fCCpdRiHfbuzKcnrqBSG1sYfM6Reg36I
+7n5x9Dpc5EihAtqK0eIO8IGxe7RAOMWOluqp2uomcifMk1boFhomPRo6Qks8bjlN
+YAV5beVe6FY9OLu0oRxOuL9gpdOb9rylqbZ3CrL4Pn4cLs0BDwejBDpD3boBT7ey
+LloiEtPsL61zbi2YMO4pLCZ8X5evYnTkLhy/VOkDSET3GbOPIDRBQysRzKMgwYlw
+2yH2+bKITAQREQIADAUCQAtD3wWDAcpsSgAKCRDeeq9ulMCcf/uzAJ49NRZqht6N
+3jKyaVYX7BLLi6JytACgkZecqJ6RAG/BRJas6A3XAVKxI/SJAhwEEAECAAYFAkAL
+Pv8ACgkQBFWNSP00KLQUUQ/9HZ5yj64wjHH+1jCLognrueR4/bzEBWjdkVa0BZM7
+tQTTSi2vz+3wNJWUiBLPKzgtUA8mVo4jtTaTgaWl4DBmdfjRpfpa7cnWL8LmJvBA
+tMUDjWbGLqX8A6Y/O2X4eJPjvWz7dayO9P+4TCJ4+GPNhXA77M9Tz4OrEhFuIovj
+ZKHvAPHxJzkvOqaQ/H+1iHf2VGJZ4FS7f54cANCbCtOf9DMwBiQ/yAf/T0sLWg1E
+tuRIqQEH6B66iKz+ORPTBSwXKLSIj14JzgOobet8r2GuQLVJiG+s7aJOhprTXyON
+Fli/cAaBDJwBBfZQO67FmOOkFhP/mkV9ZrTIcIheNxFlyPvoXKdZVZTppamPVcIW
+x8gOVySpL2PCFUWTPzlS4ER7Il27STO4+J3IVtwda5r+aH7eKAFGkfoDhwgKlOpG
+4AhBpXgOOTc1DuENW3p/bZjiu43yR5g7PZLukq0o1//OULIMxZxtZvpAdkPzQHqw
+06pAK1gghFtha1/SYZE8yLuZVaWjG14hNBVJhbuV3Ct2ov3e5JwCc98c+Et+gtK8
+pdYtIR3YcLfBWNO7M8uYzOXaeyC9DLlKKWCec6y+eXviM1u7FrSlzBmG4KLh5YDH
+VGq6CnC0b6h3IQa2wRxEUqjfXJOV0dUrn3ILyIXMisnrCBgSidg41d7HRBXSSQw0
+7fKInAQQAQEABgUCQAvocwAKCRBGUYkxK0j29dr6A/0RJh02FPWW6acLfYTs5R+z
+hWkOA5eJaGmCDNx+glAycCcv54IWZk99MGkL2WngQrqqmb+qTO6IQym79zqayik5
+2pswYR2PF+cSutVaaquA1daqlghJa7MfcJgz1z5R0atp3u1ZtTxvpwZAf4vyFlQy
+DXAzoSSIzHNY3YE1nMi084hGBBARAgAGBQJADDlhAAoJEIRLlllPaN2RD2gAnjcW
+04uxrzzC7nLEI1a+d6JSoI96AKDZQNj3mbIDZ0d+InyaPyy0c9hYM4hGBBARAgAG
+BQJADDJUAAoJEKy7FkvPc+xMQosAni9l0EZNWd9LTNZS2z68F5cdW/3+AJ9ucQhG
+1B41+BbgVU1tyPqJR5m2SQ==
+=tSAz
+-----END PGP PUBLIC KEY BLOCK-----

Author: rabbi
Date: 2004-01-19 04:32:57 +0100 (Mon, 19 Jan 2004)
New Revision: 706

Modified:
   trunk/Mix/mpgp.1
Log:
Minor cleanup.


Modified: trunk/Mix/mpgp.1
===================================================================
--- trunk/Mix/mpgp.1	2004-01-19 03:21:07 UTC (rev 705)
+++ trunk/Mix/mpgp.1	2004-01-19 03:32:57 UTC (rev 706)
@@ -1,7 +1,7 @@
-.TH MPGP 1 "Mixmaster Version 2.9.1"
+.TH MPGP 1 "Mixmaster Version 3.0"
 .\" $Id: $
 .SH NAME
-mpgp \- Mixmaster PGP module tester
+mpgp \- Mixmaster OpenPGP Module
 .SH SYNOPSIS
 .B mpgp \fB\-e\fR [\fB\-b\fR] \fIkeyname\fR [\fIfilename\fR]
 .PP
@@ -17,26 +17,26 @@
 .PP
 .B mpgp \fB\-a\fR[\fB+\-\fR] [\fB\-b\fR] [\fIfilename\fR]
 .SH DESCRIPTION
-Mixmaster is an anonymous remailer software. MPGP is a tester program
-to diagnostic problems under PGP keys and messages handled by the
-Mixmaster remailer software.
+Mixmaster is an anonymous remailer. mpgp is a light-weight OpenPGP
+implementation, primarily used to diagnose issues with OpenPGP keys and
+messages handled by the Mixmaster remailer software.
 .PP
-It can encrypts, decrypts and signs a message using the Mixmaster OpenPGP
-library. The message is read from the standard input or the specified
-\fIfilename\fR. The output will be written to the standard output. When
-called without arguments it decrypts from the standard input. It asks for
-a passphrase when needed.
+mpgp can encrypt, decrypt and sign a message using the Mixmaster 
+OpenPGP library. The message is read from the standard input or the 
+specified \fIfilename\fR. The output will be written to the standard 
+output. When called without arguments mpgp decrypts from the standard 
+input. It asks for a passphrase when needed.
 .SH OPTIONS
 .TP
 .B "\-h"
 Print a summary of command line options.
 .TP
 .B "\-e"
-Encrypt a message with the first PGP key from the public key ring whose
-contains \fIkeyname\fR as a substring.
+Encrypt a message with the first OpenPGP key from the public key ring 
+whose contains \fIkeyname\fR as a substring.
 .TP
 .B "\-s"
-Make a signature of the message with the first PGP key from the secret
+Make a signature of the message with the first OpenPGP key from the secret
 key ring, or the first key whose contains \fIkeyname\fR as a substring if
 specified.
 .TP
@@ -51,18 +51,19 @@
 needed. It also verifies its signature.
 .TP
 .B "\-g\fR[\fBr\fR]"
-Generate new PGP key pair with the given \fIkeyname\fR as user ID. If
-\fBr\fR is specified the PGP key will be created using the RSA algorithm,
-else with the ElGamal. \fIbits\fR is the key lenght and its default value
-is 1024.
+Generate new OpenPGP key pair with the given \fIkeyname\fR as user ID. If
+\fBr\fR is specified the OpenPGP key will be created using the RSA 
+algorithm, otherwise the ElGamal algorithm will be used. \fIbits\fR is the 
+key length and its default value is 1024.
 .TP
 .B "\-a\fR[\fB+\-\fR]"
-Create an ASCII PGP armored message. If \fB\-\fR is specified dearmor it.
+Create an ASCII OpenPGP armored message. If \fB\-\fR is specified mpgp 
+will remove ASCII armor.
 .TP
 .B "\-b"
 Specifies that the message is in binary format.
 .SH CONFIGURATION
-The Mixmaster PGP module tester reads its configuration from the file
+The Mixmaster OpenPGP module reads its configuration from the file
 .B mix.cfg
 in its working directory.  The configuration file consists of lines of
 the type
@@ -75,12 +76,12 @@
 .PP
 .TP
 .B PGPPUBRING
-Path to your public PGP key ring. Default:
+Path to your public OpenPGP key ring. Default:
 .BR ~/.pgp/pubring.pgp .
 (Windows default: PGP registry value.)
 .TP
 .B PGPSECRING
-Path to your secret PGP key ring. Default:
+Path to your secret OpenPGP key ring. Default:
 .BR ~/.pgp/secring.pgp .
 (Windows default: PGP registry value.)
 .SH FILES
@@ -91,16 +92,16 @@
 Mixmaster configuration file.
 .TP
 .B pubring.pgp
-PGP public keys (\fBPGPPUBRING\fP).
+OpenPGP public keys (\fBPGPPUBRING\fP).
 .TP
 .B secring.pgp
-PGP secret keys (\fBPGPSECRING\fP).
+OpenPGP secret keys (\fBPGPSECRING\fP).
 .SH SEE ALSO
-.BR mix (1),
+.BR mixmaster (1),
 .BR pgp (1),
 .BR gpg (1).
 .SH COPYRIGHT
-(C) 1999-2002 Anonymizer Inc. and others.
+(C) 1999-2004 Anonymizer Inc. and others.
 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

Author: rabbi
Date: 2004-01-19 04:21:07 +0100 (Mon, 19 Jan 2004)
New Revision: 705

Added:
   trunk/Mix/mpgp.1
Log:
Adding the mpgp man page submitted by trek.


Added: trunk/Mix/mpgp.1
===================================================================
--- trunk/Mix/mpgp.1	2004-01-17 03:54:16 UTC (rev 704)
+++ trunk/Mix/mpgp.1	2004-01-19 03:21:07 UTC (rev 705)
@@ -0,0 +1,107 @@
+.TH MPGP 1 "Mixmaster Version 2.9.1"
+.\" $Id: $
+.SH NAME
+mpgp \- Mixmaster PGP module tester
+.SH SYNOPSIS
+.B mpgp \fB\-e\fR [\fB\-b\fR] \fIkeyname\fR [\fIfilename\fR]
+.PP
+.B mpgp \fB\-s\fR [\fB\-b\fR] [\fIkeyname\fR [\fIfilename\fR]]
+.PP
+.B mpgp \fB\-c\fR [\fB\-b\fR] [\fIfilename\fR]
+.PP
+.B mpgp \fB\-C\fR [\fB\-b\fR] [\fIfilename\fR]
+.PP
+.B mpgp \fB\-d\fR [\fB\-b\fR] [\fIpassphrase\fR [\fIfilename\fR]]
+.PP
+.B mpgp \fB\-g\fR[\fBr\fR] \fIkeyname\fR [\fIbits\fR]
+.PP
+.B mpgp \fB\-a\fR[\fB+\-\fR] [\fB\-b\fR] [\fIfilename\fR]
+.SH DESCRIPTION
+Mixmaster is an anonymous remailer software. MPGP is a tester program
+to diagnostic problems under PGP keys and messages handled by the
+Mixmaster remailer software.
+.PP
+It can encrypts, decrypts and signs a message using the Mixmaster OpenPGP
+library. The message is read from the standard input or the specified
+\fIfilename\fR. The output will be written to the standard output. When
+called without arguments it decrypts from the standard input. It asks for
+a passphrase when needed.
+.SH OPTIONS
+.TP
+.B "\-h"
+Print a summary of command line options.
+.TP
+.B "\-e"
+Encrypt a message with the first PGP key from the public key ring whose
+contains \fIkeyname\fR as a substring.
+.TP
+.B "\-s"
+Make a signature of the message with the first PGP key from the secret
+key ring, or the first key whose contains \fIkeyname\fR as a substring if
+specified.
+.TP
+.B "\-c"
+Encrypt with symmetric cipher only.
+.TP
+.B "\-C"
+Encrypt with symmetric cipher only using the new OpenPGP format.
+.TP
+.B "\-d"
+Decrypt a message using \fIpassphrase\fR if specified or asking for it if
+needed. It also verifies its signature.
+.TP
+.B "\-g\fR[\fBr\fR]"
+Generate new PGP key pair with the given \fIkeyname\fR as user ID. If
+\fBr\fR is specified the PGP key will be created using the RSA algorithm,
+else with the ElGamal. \fIbits\fR is the key lenght and its default value
+is 1024.
+.TP
+.B "\-a\fR[\fB+\-\fR]"
+Create an ASCII PGP armored message. If \fB\-\fR is specified dearmor it.
+.TP
+.B "\-b"
+Specifies that the message is in binary format.
+.SH CONFIGURATION
+The Mixmaster PGP module tester reads its configuration from the file
+.B mix.cfg
+in its working directory.  The configuration file consists of lines of
+the type
+.PP
+.I VARIABLE       values
+.PP
+and of comments, which begin with a
+.B #
+character.
+.PP
+.TP
+.B PGPPUBRING
+Path to your public PGP key ring. Default:
+.BR ~/.pgp/pubring.pgp .
+(Windows default: PGP registry value.)
+.TP
+.B PGPSECRING
+Path to your secret PGP key ring. Default:
+.BR ~/.pgp/secring.pgp .
+(Windows default: PGP registry value.)
+.SH FILES
+These filenames can be overridden by setting the corresponding configuration
+option (given in parentheses).
+.TP
+.B mix.cfg
+Mixmaster configuration file.
+.TP
+.B pubring.pgp
+PGP public keys (\fBPGPPUBRING\fP).
+.TP
+.B secring.pgp
+PGP secret keys (\fBPGPSECRING\fP).
+.SH SEE ALSO
+.BR mix (1),
+.BR pgp (1),
+.BR gpg (1).
+.SH COPYRIGHT
+(C) 1999-2002 Anonymizer Inc. and others.
+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.

Author: rabbi
Date: 2004-01-17 04:54:16 +0100 (Sat, 17 Jan 2004)
New Revision: 704

Modified:
   trunk/Mix/Src/version.h
Log:
And set version.h properly in trunk.


Modified: trunk/Mix/Src/version.h
===================================================================
--- trunk/Mix/Src/version.h	2004-01-17 03:52:44 UTC (rev 703)
+++ trunk/Mix/Src/version.h	2004-01-17 03:54:16 UTC (rev 704)
@@ -1 +1 @@
-#define VERSION "3.0a9+cvs"
+#define VERSION "3.0b0+cvs"

Author: rabbi
Date: 2004-01-17 04:52:44 +0100 (Sat, 17 Jan 2004)
New Revision: 703

Modified:
   tags/mixmaster_3_0b0/Mix/Src/version.h
Log:
Fix the version number to reflect the tag. Oops.


Modified: tags/mixmaster_3_0b0/Mix/Src/version.h
===================================================================
--- tags/mixmaster_3_0b0/Mix/Src/version.h	2004-01-17 01:57:51 UTC (rev 702)
+++ tags/mixmaster_3_0b0/Mix/Src/version.h	2004-01-17 03:52:44 UTC (rev 703)
@@ -1 +1 @@
-#define VERSION "3.0a9+cvs"
+#define VERSION "3.b0"

Author: weasel
Date: 2004-01-17 02:57:51 +0100 (Sat, 17 Jan 2004)
New Revision: 702

Modified:
   trunk/Mix/TODO
Log:
Remove finished items from TODO

Modified: trunk/Mix/TODO
===================================================================
--- trunk/Mix/TODO	2004-01-17 01:51:22 UTC (rev 701)
+++ trunk/Mix/TODO	2004-01-17 01:57:51 UTC (rev 702)
@@ -11,8 +11,6 @@
   (Should this just be a call to an external program? I.e., 
   "/bin/rm -P" or "/usr/bin/shred -fz -n3")? Does this even
   serve a purpose now that journaled FSes are the norm?
-- implement time-skew sanity checks so that the timestamp, 
-  key rotation and key deletion features don't cause havok.
 
 Packaging:
 - Modify release tarball generation script to build the .tab.c file from
@@ -25,10 +23,8 @@
 - Macintosh OS/X support  (rabbi)
 - Update Install script to put files in global system locations if
   invoked by root. Also update to be smart about AES support.
-- The main binary should be called "mixmaster", not "mix".
 
 Wishlist:
-- don't drop messages if there are not enough reliable remailers.
 - permit CRAM-MD5 SMTP AUTH in addition to LOGIN.  n/a (patch welcome)
 - do full regression tests on as many platforms possible
   - list only these platforms as supported

Author: weasel
Date: 2004-01-17 02:51:22 +0100 (Sat, 17 Jan 2004)
New Revision: 701

Modified:
   trunk/Mix/HISTORY
   trunk/Mix/Src/chain2.c
Log:
Also warn if Remailer Reliability Statistics are from the future.
Also accept rfc822 style dates

Modified: trunk/Mix/HISTORY
===================================================================
--- trunk/Mix/HISTORY	2004-01-17 01:33:38 UTC (rev 700)
+++ trunk/Mix/HISTORY	2004-01-17 01:51:22 UTC (rev 701)
@@ -418,7 +418,8 @@
                              instead of 0 and maxrem - 1.  Mixmaster now uses
                              broken-chain info from stats. I hope this doesn't
                              break any Nym functionality.
-                           Warn if remailer stats are older than a day.
+                           Warn if remailer stats are older than a day or
+                             from the future.
                            Don't send messages to ourselves via the mailsystem
                              but instead place them in the pool as incoming
                              messages so that they will get processed with the

Modified: trunk/Mix/Src/chain2.c
===================================================================
--- trunk/Mix/Src/chain2.c	2004-01-17 01:33:38 UTC (rev 700)
+++ trunk/Mix/Src/chain2.c	2004-01-17 01:51:22 UTC (rev 701)
@@ -156,19 +156,24 @@
         int generated;
 	int now = time(NULL);
 	char *tmp = line + strlen("Last update:") + 1;
-	/* For some weird reason, this isn't rfc822 */
-	if (strleft(tmp, "Mon") ||
-	    strleft(tmp, "Tue") ||
-	    strleft(tmp, "Wed") ||
-	    strleft(tmp, "Thu") ||
-	    strleft(tmp, "Fri") ||
-	    strleft(tmp, "Sat") ||
-	    strleft(tmp, "Sun"))
-	  tmp += 3;
-        generated = parsedate(tmp);
+	generated = parsedate(tmp);
+	if (generated == -1) {
+	  /* For some weird reason, this isn't rfc822 */
+	  if (strleft(tmp, "Mon") ||
+	      strleft(tmp, "Tue") ||
+	      strleft(tmp, "Wed") ||
+	      strleft(tmp, "Thu") ||
+	      strleft(tmp, "Fri") ||
+	      strleft(tmp, "Sat") ||
+	      strleft(tmp, "Sun"))
+	    tmp += 3;
+          generated = parsedate(tmp);
+	}
 	now = time(NULL);
 	if (generated != -1 && generated < now - SECONDSPERDAY)
-	  errlog(WARNING, "Remailer Reliability Statistics are older than one day.\n");
+	  errlog(WARNING, "Remailer Reliability Statistics are older than one day (check your clock?).\n");
+	if (generated != -1 && generated > now)
+	  errlog(WARNING, "Remailer Reliability Statistics are from the future (check your clock?).\n");
       }
     };
     while (fgets(line, sizeof(line), list) != NULL &&

Author: weasel
Date: 2004-01-17 02:33:38 +0100 (Sat, 17 Jan 2004)
New Revision: 700

Modified:
   trunk/Mix/HISTORY
   trunk/Mix/Src/config.h
   trunk/Mix/Src/main.c
   trunk/Mix/Src/mix.c
   trunk/Mix/Src/mix.h
   trunk/Mix/mixmaster.1
Log:
Try to detect timeskews and refuse to run as a remailer if there is a problem
suspected.  Only applies to mixmaster in remailer mode.


Modified: trunk/Mix/HISTORY
===================================================================
--- trunk/Mix/HISTORY	2004-01-17 01:32:21 UTC (rev 699)
+++ trunk/Mix/HISTORY	2004-01-17 01:33:38 UTC (rev 700)
@@ -392,6 +392,9 @@
                            Drop messages without timestamps and messages with
                              future timestamps.  This abandons backwards
                              compatibility with Mixmaster 2.0.3 and earlier.
+                           Try to detect timeskews and refuse to run as a
+                             remailer if there is a problem suspected.  Only
+                             applies to mixmaster in remailer mode.
 
                            BUG FIXES:
 

Modified: trunk/Mix/Src/config.h
===================================================================
--- trunk/Mix/Src/config.h	2004-01-17 01:32:21 UTC (rev 699)
+++ trunk/Mix/Src/config.h	2004-01-17 01:33:38 UTC (rev 700)
@@ -367,6 +367,9 @@
 extern char MAILBOUNCE[];
 extern int CLIENTAUTOFLUSH;
 extern int MAXRECIPIENTS;
+extern long TIMESKEW_FORWARD;
+extern long TIMESKEW_BACK;
+extern int TEMP_FAIL;
 
 DLLIMPORT extern char ENTEREDPASSPHRASE[LINELEN];
 

Modified: trunk/Mix/Src/main.c
===================================================================
--- trunk/Mix/Src/main.c	2004-01-17 01:32:21 UTC (rev 699)
+++ trunk/Mix/Src/main.c	2004-01-17 01:33:38 UTC (rev 700)
@@ -417,6 +417,10 @@
   if (header == 0)
     buf_nl(msg);
 
+  /* timeskew check */
+  if (REMAIL == 1)
+    mix_check_timeskew();
+
   if (readmail || redirect_mail || send == MSG_MAIL || send == MSG_POST) {
     if (filename == NULL || streq(filename, "-"))
       f = stdin;

Modified: trunk/Mix/Src/mix.c
===================================================================
--- trunk/Mix/Src/mix.c	2004-01-17 01:32:21 UTC (rev 699)
+++ trunk/Mix/Src/mix.c	2004-01-17 01:33:38 UTC (rev 700)
@@ -175,6 +175,10 @@
 int CLIENTAUTOFLUSH;
 int MAXRECIPIENTS;
 
+long TIMESKEW_FORWARD;
+long TIMESKEW_BACK;
+int TEMP_FAIL;
+
 char ENTEREDPASSPHRASE[LINELEN] = "";
 
 static int rereadconfig = 0;
@@ -515,6 +519,10 @@
 
 	CLIENTAUTOFLUSH = 1;
 	MAXRECIPIENTS   = 5;
+
+	TIMESKEW_FORWARD = 2*7*24*60*60;
+	TIMESKEW_BACK = 12*60*60;
+	TEMP_FAIL = 75;
 }
 
 int mix_configline(char *line)
@@ -586,7 +594,11 @@
 	  read_conf(NYMDB) || read_conf(PIDFILE) ||
 	  
 	  read_conf_i(CLIENTAUTOFLUSH) ||
-	  read_conf_i(MAXRECIPIENTS) );
+	  read_conf_i(MAXRECIPIENTS) ||
+	  
+	  read_conf_t(TIMESKEW_FORWARD) ||
+	  read_conf_t(TIMESKEW_BACK) ||
+	  read_conf_i(TEMP_FAIL) );
 }
 
 int mix_config(void)
@@ -813,6 +825,33 @@
 
 static int initialized = 0;
 
+void mix_check_timeskew() {
+  FILE *f;
+  long now, tpool = 0, tpop3 = 0, tdaily = 0, tmailin = 0, latest = 0;
+
+  f = mix_openfile(REGULAR, "r+");
+  if (f != NULL) {
+    lock(f);
+    fscanf(f, "%ld %ld %ld %ld", &tpool, &tpop3, &tdaily, &tmailin);
+    latest = tpool;
+    latest = latest > tpop3 ? latest : tpop3;
+    latest = latest > tdaily ? latest : tdaily;
+    latest = latest > tmailin ? latest : tmailin;
+    now = time(NULL);
+
+
+    if (( (TIMESKEW_BACK    != 0) && (now < latest - TIMESKEW_BACK   )) ||
+        ( (TIMESKEW_FORWARD != 0) && (now > latest + TIMESKEW_FORWARD)) ) {
+      /* Possible timeskew */
+      errlog(ERRORMSG, "Possible timeskew detected.  Check clock and rm %s\n", REGULAR);
+      exit(TEMP_FAIL);
+    }
+    fclose(f);
+  } else {
+    /* shrug */
+  }
+}
+
 int mix_init(char *mixdir)
 {
   if (!initialized) {

Modified: trunk/Mix/Src/mix.h
===================================================================
--- trunk/Mix/Src/mix.h	2004-01-17 01:32:21 UTC (rev 699)
+++ trunk/Mix/Src/mix.h	2004-01-17 01:33:38 UTC (rev 700)
@@ -847,6 +847,7 @@
 #define FORCE_POP3 2
 #define FORCE_DAILY 4
 #define FORCE_MAILIN 8
+void mix_check_timeskew(void);
 int mix_regular(int force);
 int mix_daemon(void);
 int process_mailin(void);

Modified: trunk/Mix/mixmaster.1
===================================================================
--- trunk/Mix/mixmaster.1	2004-01-17 01:32:21 UTC (rev 699)
+++ trunk/Mix/mixmaster.1	2004-01-17 01:33:38 UTC (rev 700)
@@ -624,6 +624,18 @@
 limits the number of allowed recipients in outgoing mail.  Anything that exceeds this
 number is dropped silently.  Default:
 .BR 5 .
+.TP
+.B TEMP_FAIL
+exit with this exit code when a timeskew problem is suspected.  Also see
+.BR TIMESKEW_BACK
+and
+.BR TIMESKEW_FORWARD .
+The default of
+.B 75
+should cause your MTA to requeue the message if you are running
+mixmaster from a
+.BR .forward
+file.
 .PP
 The following are time variables. They can be given as years (
 .BR y
@@ -708,7 +720,29 @@
 period of time before the expiration of the key. Clients should always use 
 the most recently created valid key. Clients that deviate from this 
 recommended behavior risk partitioning attacks. Default:
-.BR 1b . 
+.BR 7d .
+.TP
+.B TIMESKEW_BACK
+Allow going back up to
+.BR TIMESKEW_BACK
+in time.  If the time moved further back mixmaster will assume
+there is a problem with your clock and refuse to start as a remailer.
+This is done by comparing the latest timestamp in 
+.BR time.log
+with the current timestamp.  If set to
+.BR 0
+then this test is skipped.  If the system time is indeed correct, simply
+remove
+.BR time.log .
+Default: 
+.BR 12h .
+.TP
+.B TIMESKEW_FORWARD
+Similar to
+.BR TIMESKEW_BACK
+but allow jumping this far into the future.
+Default: 
+.BR 2w .
 .PP
 The following strings must be specified at compile-time in
 .BR config.h .

Author: weasel
Date: 2004-01-17 02:32:21 +0100 (Sat, 17 Jan 2004)
New Revision: 699

Modified:
   trunk/Mix/HISTORY
Log:
Fix layout

Modified: trunk/Mix/HISTORY
===================================================================
--- trunk/Mix/HISTORY	2004-01-17 01:13:05 UTC (rev 698)
+++ trunk/Mix/HISTORY	2004-01-17 01:32:21 UTC (rev 699)
@@ -347,8 +347,8 @@
                            Mixmaster will not encrypt or sign with a revoked
                              or expired key.
                            When encrypting, Mixmaster uses preferences from
-                            the primary userid (or the latest userid, if zero
-                            or more than one primary userid is present.)
+                             the primary userid (or the latest userid, if zero
+                             or more than one primary userid is present.)
                            Mixmaster keys now have creation and expiration date.
                              It is not secured by any crypto voodoo, it's only
                              informational for clients to decide which keys to
@@ -390,8 +390,8 @@
                              remailer-{help,key, stats,conf,adminkey} still are
                              special cases tho.
                            Drop messages without timestamps and messages with
-                            future timestamps.  This abandons backwards
-                            compatibility with Mixmaster 2.0.3 and earlier.
+                             future timestamps.  This abandons backwards
+                             compatibility with Mixmaster 2.0.3 and earlier.
 
                            BUG FIXES:
 
@@ -411,26 +411,26 @@
                              doubled)
                            Found that weird bug that sometimes led to "Unknown
                              remailer version!" errors: In chain_randfinal() we
-                             selected a random value between 0 and maxrem instead
-                             of 0 and maxrem - 1.  Mixmaster now uses
+                             selected a random value between 0 and maxrem
+                             instead of 0 and maxrem - 1.  Mixmaster now uses
                              broken-chain info from stats. I hope this doesn't
                              break any Nym functionality.
                            Warn if remailer stats are older than a day.
                            Don't send messages to ourselves via the mailsystem
-                            but instead place them in the pool as incoming
-                            messages so that they will get processed with the
-                            next pool run.
-                          No longer try to send a message if there are no
-                            recipients left.
-                          Set default max-randhops from 20 to 4.
-                          Remix-To chain is limited by max-randhops limit as
-                            well.
-                          Messages to more than one remailer are dropped.
-                          Nym support is not compiled in by default anymore.
-                          Ignore 'No reliable remailers' problems when
-                            randhopping messages in middleman mode.
-                            That is better than dropping them.
-                          Experimental feature:  --redirect -l <chain>.
+                             but instead place them in the pool as incoming
+                             messages so that they will get processed with the
+                             next pool run.
+                           No longer try to send a message if there are no
+                             recipients left.
+                           Set default max-randhops from 20 to 4.
+                           Remix-To chain is limited by max-randhops limit as
+                             well.
+                           Messages to more than one remailer are dropped.
+                           Nym support is not compiled in by default anymore.
+                           Ignore 'No reliable remailers' problems when
+                             randhopping messages in middleman mode.
+                             That is better than dropping them.
+                           Experimental feature:  --redirect -l <chain>.
                              If you have a mixmaster message with a
                              chain starting with hop1 (you cannot know any
                              more because it already is encrypted) then

Author: weasel
Date: 2004-01-17 02:13:05 +0100 (Sat, 17 Jan 2004)
New Revision: 698

Modified:
   trunk/Mix/Src/Makefile.in
Log:
The binary is called mixmaster, so let the mixmaster target build mixmaster

Modified: trunk/Mix/Src/Makefile.in
===================================================================
--- trunk/Mix/Src/Makefile.in	2004-01-16 19:10:54 UTC (rev 697)
+++ trunk/Mix/Src/Makefile.in	2004-01-17 01:13:05 UTC (rev 698)
@@ -29,11 +29,9 @@
 NOMENUOBJ = rndseed.o dummy.o
 WINOBJ = winmain.o winutil.o
 
-all:	mix
+all:	mixmaster
 
-mixmaster:	mix
-
-mix:	$(OBJ) $(MIXOBJ) main.o $(LIBS)
+mixmaster: $(OBJ) $(MIXOBJ) main.o $(LIBS)
 	$(CC) $(OBJ) $(MIXOBJ) main.o $(LIBS) $(LDFLAGS) -o mixmaster
 
 libmix.a: $(OBJ) $(MIXOBJ) dllmain.o

Author: weasel
Date: 2004-01-16 20:10:54 +0100 (Fri, 16 Jan 2004)
New Revision: 697

Added:
   tags/mixmaster_3_0b0/Mix/
Log:
Tag trunk as mixmaster_3_0b0


Copied: tags/mixmaster_3_0b0/Mix (from rev 696, trunk/Mix)

Author: weasel
Date: 2004-01-16 20:08:41 +0100 (Fri, 16 Jan 2004)
New Revision: 696

Added:
   tags/mixmaster_3_0b0/
Log:
Prepare tag mixmaster_3_0b0.

Patches item #877312, was opened at 2004-01-15 03:14
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=877312&group_id=37891

Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Submitted By: Trek Star (trek00)
Assigned to: Nobody/Anonymous (nobody)
Summary: doallow() should check more than one email address in a line

Initial Comment:
doallow() should check if all the addresses in the line
are allowed.
doblock() comment about logandreset is wrong.
This patch adds the code to check all the addresses in
the line.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=877312&group_id=37891

Patches item #877309, was opened at 2004-01-15 03:02
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=877309&group_id=37891

Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Submitted By: Trek Star (trek00)
Assigned to: Nobody/Anonymous (nobody)
Summary: mpgp manual page

Initial Comment:
I written a little manual page (i think with many
typos) reading the pgptest.c and mix.h code.

Tell me if something should be rewritten or added.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=877309&group_id=37891

Author: ulf
Date: 2004-01-11 16:47:27 +0100 (Sun, 11 Jan 2004)
New Revision: 695

Modified:
   trunk/Mix/README
Log:
The program is now called mixmaster.

Modified: trunk/Mix/README
===================================================================
--- trunk/Mix/README	2003-12-26 00:30:31 UTC (rev 694)
+++ trunk/Mix/README	2004-01-11 15:47:27 UTC (rev 695)
@@ -70,7 +70,7 @@
 #define DESTBLOCK "dest.blk rab.blk rab2.blk rab3.blk"
 
 Note that only the first file should the the local block list, as it is the
-only file mix will open for writing. Most users will not need to edit
+only file mixmaster will open for writing. Most users will not need to edit
 config.h.
 
 [1] Update: As of the release of Mixmaster 3.0, the Paracrypt RAB site is

Patches item #873498, was opened at 2004-01-09 04:33
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=873498&group_id=37891

Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Submitted By: Trek Star (trek00)
Assigned to: Nobody/Anonymous (nobody)
Summary: Destination block requests with confirm

Initial Comment:
This patch adds the CONFIRM-BLOCK request and if
autoblock is enabled the blockrequest() function send a
confirmation request to the specified address. It
should allow to block a domain.

PLEASE TO DO NOT APPLY THIS PATCH TO THE MAIN SOURCE!!
It is here only for public review.


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=873498&group_id=37891

Patches item #873497, was opened at 2004-01-09 04:28
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=873497&group_id=37891

Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Submitted By: Trek Star (trek00)
Assigned to: Nobody/Anonymous (nobody)
Summary: Padding with pseudo-random data

Initial Comment:
The usage of random number generator when making
garbage to fill a buffer ruins the entropy level for
cryptographic functions when making garbage to pad type
2 messages and headers or inflate type 1 messages.
Can be a problem on large remailers when many padding
are done, because   if the entropy pool is empty the
cryptographic functions may produce predictable results.

The patch change the buf_pad() function to use pseudo
random bytes.
I'm not sure that this is a good thing when padding
type 2 headers.

PLEASE TO DO NOT APPLY THIS PATCH TO THE MAIN SOURCE!!
It is here only for public review.


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=423729&aid=873497&group_id=37891