[exim-cvs] cvs commit: exim/exim-test-orig/AutoTest/confs 21…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Philip Hazel
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-test-orig/AutoTest/confs 210 391 exim/exim-test-orig/AutoTest/log 210G 211G 216G 218G 219G 220G 221G 222G 223G 224G 225G 264G 297G 321G 391G 561G exim/exim-test-ori
ph10 2005/06/27 16:04:29 BST

  Modified files:
    exim-test-orig/AutoTest/confs 210 391 
    exim-test-orig/AutoTest/log 210G 211G 216G 218G 219G 220G 221G 
                                222G 223G 224G 225G 264G 297G 321G 
                                391G 561G 
    exim-test-orig/AutoTest/mail 210G.ph10 211G.ph10 216G.abcd 
                                 216G.ph10 216G.xyz 221G.ph10 
                                 222G.ph10 223G.ph10 264G.ph10 
                                 297G.ph10 391G.ph10 
    exim-test-orig/AutoTest/rejectlog 211G 
    exim-test-orig/AutoTest/stderr 216G 
    exim-test-orig/AutoTest/stdout 210G 211G 213G 214G 215G 225G 
                                   321G 391G 429G 486G 550G 584G 
  Log:
  The latest version of GnuTLS selects AES rather than 3DES as its
  preferred cipher; some message wording has changed. Update the tests to
  deal with these changes.


  Revision  Changes    Path
  1.3       +5 -1      exim/exim-test-orig/AutoTest/confs/210
  1.3       +5 -1      exim/exim-test-orig/AutoTest/confs/391
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/210G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/211G
  1.3       +7 -7      exim/exim-test-orig/AutoTest/log/216G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/218G
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/219G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/220G
  1.3       +4 -4      exim/exim-test-orig/AutoTest/log/221G
  1.3       +4 -4      exim/exim-test-orig/AutoTest/log/222G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/223G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/224G
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/225G
  1.3       +4 -4      exim/exim-test-orig/AutoTest/log/264G
  1.3       +4 -4      exim/exim-test-orig/AutoTest/log/297G
  1.3       +1 -1      exim/exim-test-orig/AutoTest/log/321G
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/391G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/log/561G
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/210G.ph10
  1.3       +2 -2      exim/exim-test-orig/AutoTest/mail/211G.ph10
  1.3       +2 -2      exim/exim-test-orig/AutoTest/mail/216G.abcd
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/216G.ph10
  1.3       +2 -2      exim/exim-test-orig/AutoTest/mail/216G.xyz
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/221G.ph10
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/222G.ph10
  1.3       +2 -2      exim/exim-test-orig/AutoTest/mail/223G.ph10
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/264G.ph10
  1.3       +4 -4      exim/exim-test-orig/AutoTest/mail/297G.ph10
  1.2       +4 -4      exim/exim-test-orig/AutoTest/mail/391G.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/rejectlog/211G
  1.3       +4 -4      exim/exim-test-orig/AutoTest/stderr/216G
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/210G
  1.3       +3 -3      exim/exim-test-orig/AutoTest/stdout/211G
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/213G
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/214G
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/215G
  1.3       +7 -7      exim/exim-test-orig/AutoTest/stdout/225G
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/321G
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/391G
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/429G
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/486G
  1.3       +2 -2      exim/exim-test-orig/AutoTest/stdout/550G
  1.2       +2 -2      exim/exim-test-orig/AutoTest/stdout/584G


  Index: 210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/210,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 210    3 May 2005 14:20:01 -0000    1.2
  +++ 210    27 Jun 2005 15:04:28 -0000    1.3
  @@ -35,7 +35,11 @@
   check_recipient:
     accept  hosts = :
     deny    hosts = <; ::1
  -         !encrypted = AES256-SHA : IDEA-CBC-MD5:DES-CBC3-SHA : DHE_RSA_3DES_EDE_CBC_SHA
  +         !encrypted = AES256-SHA : \
  +                      IDEA-CBC-MD5 : \
  +                      DES-CBC3-SHA : \
  +                      DHE_RSA_AES_256_CBC_SHA1 : \ 
  +                      DHE_RSA_3DES_EDE_CBC_SHA
     accept  




  Index: 391
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/391,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 391    3 May 2005 14:20:01 -0000    1.2
  +++ 391    27 Jun 2005 15:04:28 -0000    1.3
  @@ -35,7 +35,11 @@
   check_recipient:
     accept  hosts = :
     deny    hosts = <; ::1
  -         !encrypted = AES256-SHA:IDEA-CBC-MD5:DES-CBC3-SHA:DHE_RSA_3DES_EDE_CBC_SHA 
  +         !encrypted = AES256-SHA:\
  +                      IDEA-CBC-MD5:\
  +                      DES-CBC3-SHA:\
  +                      DHE_RSA_AES_256_CBC_SHA1:\
  +                      DHE_RSA_3DES_EDE_CBC_SHA 
     accept  




  Index: 210G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/210G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 210G    10 Nov 2004 15:21:17 -0000    1.2
  +++ 210G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 S=215
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 S=215
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1] (gnutls_handshake): The peer did not send any certificate.
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtps X=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=230
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtps X=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=230
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=abc T=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 211G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/211G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 211G    10 Nov 2004 15:21:17 -0000    1.2
  +++ 211G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=smtps X=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 S=231
  +1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=smtps X=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 S=231
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=abc T=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 216G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/216G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 216G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 216G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,19 +1,19 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=289
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=278
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  -1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@??? R=client T=send_to_server2 H=::1 [::1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@??? R=client T=send_to_server2 H=::1 [::1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=(helo.data.changed) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=501 id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=(helo.data.changed) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=472 id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=480 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=(helo.data.changed) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=502 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=(helo.data.changed) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=473 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=481 id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=server T=local_delivery
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

  Index: 218G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/218G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 218G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 218G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,10 +1,10 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=::1 [::1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=::1 [::1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=475 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=476 id=E10HmaX-0005vi-00@???

  Index: 219G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/219G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 219G    8 Oct 2004 14:49:31 -0000    1.1
  +++ 219G    27 Jun 2005 15:04:28 -0000    1.2
  @@ -1,11 +1,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=268
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ::1 [::1] (gnutls_handshake): No supported cipher suites have been found.
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_ARCFOUR_SHA:16 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_ARCFOUR_SHA1:16 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [::1] (gnutls_handshake): A TLS packet with unexpected length was received.
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_ARCFOUR_SHA:16 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=484 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_ARCFOUR_SHA1:16 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=485 id=E10HmaX-0005vi-00@???

  Index: 220G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/220G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 220G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 220G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,7 +1,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=268
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ::1 [::1]: certificate verification failed (invalid)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 CV=yes DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 CV=yes DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


@@ -9,4 +9,4 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
1999-03-02 09:44:33 TLS recv error on connection from localhost [::1]: A TLS fatal alert has been received.: Certificate is bad
1999-03-02 09:44:33 TLS send error on connection from localhost [::1]: The specified session has been invalidated for some reason.
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 CV=yes DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=488 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 CV=yes DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=489 id=E10HmaX-0005vi-00@???

  Index: 221G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/221G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 221G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 221G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,17 +1,17 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qqf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=501 id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=501 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=502 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1]:1111 U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=502 id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=server T=local_delivery

  Index: 222G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/222G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 222G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 222G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,16 +1,16 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qqf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA:32 A=plain:ph10 S=496 id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA:32 A=plain:ph10 S=496 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 A=plain:ph10 S=497 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 A=plain:ph10 S=497 id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=server T=local_delivery
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

  Index: 223G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/223G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 223G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 223G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,12 +1,12 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=493 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=494 id=E10HmaX-0005vi-00@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=server T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

  Index: 224G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/224G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 224G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 224G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,9 +1,9 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=273
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" C="250 OK id=10HmaY-0005vi-00"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" C="250 OK id=10HmaY-0005vi-00"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=493 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=494 id=E10HmaX-0005vi-00@???

  Index: 225G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/225G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 225G    10 Nov 2004 15:21:17 -0000    1.2
  +++ 225G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -4,5 +4,5 @@
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1]: certificate verification failed (invalid)
   1999-03-02 09:44:33 H=[127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: certificate not verified: peerdn=C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1]: certificate verification failed (invalid)
  +1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1]: certificate verification failed (revoked)
   1999-03-02 09:44:33 H=[127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: certificate not verified: peerdn=C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel


  Index: 264G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/264G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 264G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 264G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,16 +1,16 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qqf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA:32 A=plain:ph10 S=496 id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA:32 A=plain:ph10 S=496 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 A=plain:ph10 S=497 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtpsa X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 A=plain:ph10 S=497 id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=server T=local_delivery
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

  Index: 297G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/297G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 297G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 297G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,16 +1,16 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=275
   1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qqf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=495 id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA:32 S=495 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=496 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 S=496 id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=server T=local_delivery
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

  Index: 321G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/321G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 321G    10 Nov 2004 15:21:17 -0000    1.2
  +++ 321G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,3 +1,3 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 S=215
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 S=215
   1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: "You must encrypt"


  Index: 391G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/391G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391G    8 Oct 2004 14:49:31 -0000    1.1
  +++ 391G    27 Jun 2005 15:04:28 -0000    1.2
  @@ -1,6 +1,6 @@
   1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225 (IPv6 and IPv4)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 S=232
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtp X=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=229
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 S=232
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtp X=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel" S=229
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=abc T=local_delivery
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed


  Index: 561G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/561G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 561G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 561G    27 Jun 2005 15:04:28 -0000    1.3
  @@ -1,11 +1,11 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=268
   1999-03-02 09:44:33 Start queue run: pid=pppp -qf
   1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ::1 [::1] (gnutls_handshake): A TLS packet with unexpected length was received.
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_3DES_EDE_CBC_SHA:24 CV=no DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_3DES_EDE_CBC_SHA1:24 CV=no DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 End queue run: pid=pppp -qf


******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [::1] (gnutls_handshake): No supported cipher suites have been found.
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_3DES_EDE_CBC_SHA:24 CV=no S=489 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtps X=TLS-1.0:RSA_3DES_EDE_CBC_SHA1:24 CV=no S=490 id=E10HmaX-0005vi-00@???

  Index: 210G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/210G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 210G.ph10    10 Nov 2004 15:21:17 -0000    1.2
  +++ 210G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,22 +1,22 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1]
  -    by myhost.test.ex with smtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24)
  +    by myhost.test.ex with smtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
   tls-certificate-verified: 0
  -TLS: cipher=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 peerdn=
  +TLS: cipher=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 peerdn=


This is a test encrypted message.

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [::1]
  -    by myhost.test.ex with smtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24)
  +    by myhost.test.ex with smtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
   tls-certificate-verified: 1
  -TLS: cipher=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 peerdn=C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel
  +TLS: cipher=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 peerdn=C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel


This is a test encrypted message from a verified host.


  Index: 211G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/211G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 211G.ph10    10 Nov 2004 15:21:17 -0000    1.2
  +++ 211G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,10 +1,10 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=rhu.barb)
  -    by myhost.test.ex with smtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24)
  +    by myhost.test.ex with smtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 peerdn=
  +TLS: cipher=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 peerdn=


This is a test encrypted message.


  Index: 216G.abcd
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/216G.abcd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 216G.abcd    21 Dec 2004 09:26:32 -0000    1.2
  +++ 216G.abcd    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,6 +1,6 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost ([::1] helo=myhost.test.ex)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbB-0005vi-00
       for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -9,7 +9,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message to two different hosts


  Index: 216G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/216G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 216G.ph10    21 Dec 2004 09:26:32 -0000    1.2
  +++ 216G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,6 +1,6 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=helo.data.changed ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -10,13 +10,13 @@
   Message-Id: <E10HmaX-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message. Contains FF: ÿ

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=helo.data.changed ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
   Received: from ph10 by myhost.test.ex with local (Exim x.yz)
  @@ -24,7 +24,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message to two different hosts


  Index: 216G.xyz
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/216G.xyz,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 216G.xyz    21 Dec 2004 09:26:32 -0000    1.2
  +++ 216G.xyz    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,6 +1,6 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=helo.data.changed ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
   Received: from ph10 by myhost.test.ex with local (Exim x.yz)
  @@ -8,7 +8,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message to two different hosts


  Index: 221G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/221G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 221G.ph10    21 Dec 2004 09:26:32 -0000    1.2
  +++ 221G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,7 +1,7 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1]:1111 helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -11,14 +11,14 @@
   Message-Id: <E10HmaX-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 1

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1]:1111 helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -28,7 +28,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 2


  Index: 222G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/222G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 222G.ph10    21 Dec 2004 09:26:32 -0000    1.2
  +++ 222G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,7 +1,7 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -11,14 +11,14 @@
   Message-Id: <E10HmaX-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 1

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -28,7 +28,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 2


  Index: 223G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/223G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 223G.ph10    21 Dec 2004 09:26:32 -0000    1.2
  +++ 223G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,7 +1,7 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -11,7 +11,7 @@
   Message-Id: <E10HmaX-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message


  Index: 264G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/264G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 264G.ph10    21 Dec 2004 09:26:32 -0000    1.2
  +++ 264G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,7 +1,7 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -11,14 +11,14 @@
   Message-Id: <E10HmaX-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 1

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -28,7 +28,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 2


  Index: 297G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/297G.ph10,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 297G.ph10    21 Dec 2004 09:26:32 -0000    1.2
  +++ 297G.ph10    27 Jun 2005 15:04:29 -0000    1.3
  @@ -1,7 +1,7 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -11,14 +11,14 @@
   Message-Id: <E10HmaX-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 1

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from localhost
       ([127.0.0.1] helo=myhost.test.ex ident=exim)
  -    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32)
  +    by myhost.test.ex with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -28,7 +28,7 @@
   Message-Id: <E10HmaY-0005vi-00@???>
   From: Philip Hazel <ph10@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA:32 peerdn=
  +TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=


Test message 2


  Index: 391G.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/391G.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391G.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 391G.ph10    27 Jun 2005 15:04:29 -0000    1.2
  @@ -1,20 +1,20 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=rhu.barb)
  -    by myhost.test.ex with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24)
  +    by myhost.test.ex with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 peerdn=
  +TLS: cipher=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 peerdn=


This is a test encrypted message.

   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [::1]
  -    by myhost.test.ex with smtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24)
  +    by myhost.test.ex with smtp (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  -TLS: cipher=TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24 peerdn=C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel
  +TLS: cipher=TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32 peerdn=C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel


This is a test encrypted message from a verified host.


  Index: 211G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/211G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 211G    8 Oct 2004 14:49:51 -0000    1.1
  +++ 211G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -1 +1 @@
  -1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24
  +1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32


  Index: 216G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/216G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 216G    21 Dec 2004 09:26:32 -0000    1.2
  +++ 216G    27 Jun 2005 15:04:29 -0000    1.3
  @@ -26,7 +26,7 @@
     SMTP<< 250 OK id=10HmaZ-0005vi-00
     SMTP>> QUIT
   LOG: MAIN
  -  => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +  => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   LOG: MAIN
     Completed
   delivering 10HmaY-0005vi-00 (queue run pid ppppp)
  @@ -57,9 +57,9 @@
     SMTP<< 250 OK id=10HmbA-0005vi-00
     SMTP>> QUIT
   LOG: MAIN
  -  => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +  => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   LOG: MAIN
  -  -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +  -> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   Connecting to ::1 [::1]:1225 ... connected
     SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
     SMTP>> EHLO myhost.test.ex
  @@ -85,7 +85,7 @@
     SMTP<< 250 OK id=10HmbB-0005vi-00
     SMTP>> QUIT
   LOG: MAIN
  -  => abcd@??? R=client T=send_to_server2 H=::1 [::1] X=TLS-1.0:RSA_AES_256_CBC_SHA:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
  +  => abcd@??? R=client T=send_to_server2 H=::1 [::1] X=TLS-1.0:RSA_AES_256_CBC_SHA1:32 DN="C=UK,L=Cambridge,O=University of Cambridge,OU=Computing Service,CN=Philip Hazel"
   LOG: MAIN
     Completed
   LOG: queue_run MAIN


  Index: 210G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/210G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 210G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 210G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -30,7 +30,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -121,7 +121,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 211G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/211G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 211G    10 Nov 2004 15:21:17 -0000    1.2
  +++ 211G    27 Jun 2005 15:04:29 -0000    1.3
  @@ -30,14 +30,14 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
   <<< 250 OK
   >>> rcpt to:<ph10@???>
   ??? 550
  -<<< 550 unacceptable cipher TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24
  +<<< 550 unacceptable cipher TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32
   >>> quit
   ??? 221
   <<< 221 myhost.test.ex closing connection
  @@ -74,7 +74,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> helo rhu.barb
   ??? 250


  Index: 213G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/213G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 213G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 213G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -36,7 +36,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 214G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/214G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 214G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 214G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -30,7 +30,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   +++ 3
   End of script


  Index: 215G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/215G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 215G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 215G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -58,7 +58,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> ehlo foobar
   ??? 250-


  Index: 225G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/225G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 225G    10 Nov 2004 15:21:17 -0000    1.2
  +++ 225G    27 Jun 2005 15:04:29 -0000    1.3
  @@ -67,7 +67,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> helo rhu.barb
   ??? 250
  @@ -119,7 +119,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -168,7 +168,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -217,7 +217,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   End of script
   Certificate file = aux/cert1
  @@ -257,7 +257,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250
  @@ -308,7 +308,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   End of script
   Certificate file = aux/cert1
  @@ -348,7 +348,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 321G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/321G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 321G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 321G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -30,7 +30,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> mail from:<ph10@???>
   ??? 250


  Index: 391G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/391G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 391G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -14,7 +14,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  @@ -65,7 +65,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000


  Index: 429G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/429G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 429G    8 Oct 2004 14:50:13 -0000    1.1
  +++ 429G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -30,7 +30,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> help
   ??? 214-


  Index: 486G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/486G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 486G    8 Oct 2004 14:50:14 -0000    1.1
  +++ 486G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -32,7 +32,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> auth plain AHBoMTAAc2VjcmV0
   ??? 503
  @@ -78,7 +78,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> auth plain AHBoMTAAc2VjcmV0
   ??? 235


  Index: 550G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/550G,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 550G    25 Nov 2004 10:26:05 -0000    1.2
  +++ 550G    27 Jun 2005 15:04:29 -0000    1.3
  @@ -35,7 +35,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   End of script
   Certificate file = aux/cert2
  @@ -62,6 +62,6 @@
   SSL info: before/connect initialization
   SSL info: SSLv2/v3 write client hello A
   SSL info: SSLv2/v3 read server hello A
  -pppp:error140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol:s23_clnt.c:470:
  +pppp:error140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol:s23_clnt.c:478:
   Failed to start TLS
   End of script


  Index: 584G
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/584G,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 584G    21 Dec 2004 09:26:32 -0000    1.1
  +++ 584G    27 Jun 2005 15:04:29 -0000    1.2
  @@ -30,7 +30,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   >>> quit
   ??? 221
  @@ -52,7 +52,7 @@
   SSL info: SSLv3 read finished A
   SSL info: SSL negotiation finished successfully
   SSL info: SSL negotiation finished successfully
  -SSL connection using EDH-RSA-DES-CBC3-SHA
  +SSL connection using DHE-RSA-AES256-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000