[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Página Inicial
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
Para: exim-cvs
Assunto: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src tls-openssl.c exim/exim-test-orig/AutoTest/log 210 211 216 218 219 220 221 222 223 224 225 264 297 321 391 550 561 exim/exi
ph10 2004/11/25 15:29:37 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         tls-openssl.c 
    exim-test-orig/AutoTest/log 210 211 216 218 219 220 221 222 
                                223 224 225 264 297 321 391 550 
                                561 
    exim-test-orig/AutoTest/mail 210.ph10 211.ph10 216.abcd 
                                 216.ph10 216.xyz 221.ph10 
                                 222.ph10 223.ph10 264.ph10 
                                 297.ph10 391.ph10 
    exim-test-orig/AutoTest/rejectlog 225 
    exim-test-orig/AutoTest/stderr 210 216 
    exim-test-orig/AutoTest/stdout 211 225 230 550 584 
  Log:
  OpenSSL: make same change as recently for GnuTLS: show file name if
  certificate or key file setup fails, because the message from the
  library doesn't. Also, update all the OpenSSL TLS tests, which hadn't
  been tried for a while, for various recent changes such as protocol
  names.


  Revision  Changes    Path
  1.42      +2 -0      exim/exim-doc/doc-txt/ChangeLog
  1.2       +4 -2      exim/exim-src/src/tls-openssl.c
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/210
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/211
  1.2       +3 -3      exim/exim-test-orig/AutoTest/log/216
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/218
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/219
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/220
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/221
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/222
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/223
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/224
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/225
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/264
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/297
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/321
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/391
  1.2       +2 -0      exim/exim-test-orig/AutoTest/log/550
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/561
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/210.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/211.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/216.abcd
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/216.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/216.xyz
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/221.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/222.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/223.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/264.ph10
  1.2       +2 -2      exim/exim-test-orig/AutoTest/mail/297.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/mail/391.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/rejectlog/225
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stderr/210
  1.2       +2 -0      exim/exim-test-orig/AutoTest/stderr/216
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stdout/211
  1.2       +3 -0      exim/exim-test-orig/AutoTest/stdout/225
  1.2       +1 -0      exim/exim-test-orig/AutoTest/stdout/230
  1.2       +27 -0     exim/exim-test-orig/AutoTest/stdout/550
  1.2       +2 -4      exim/exim-test-orig/AutoTest/stdout/584


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ChangeLog    25 Nov 2004 13:54:31 -0000    1.41
  +++ ChangeLog    25 Nov 2004 15:29:36 -0000    1.42
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.41 2004/11/25 13:54:31 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.42 2004/11/25 15:29:36 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -177,6 +177,8 @@
       of the failing file when there is a problem reading it.


42. Allow both -bf and -bF in the same test run.
+
+43. Did the same fix as 41 above for OpenSSL, which had the same infelicity.


Exim version 4.43

  Index: tls-openssl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/tls-openssl.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tls-openssl.c    7 Oct 2004 10:39:01 -0000    1.1
  +++ tls-openssl.c    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/tls-openssl.c,v 1.2 2004/11/25 15:29:37 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -381,7 +381,8 @@
       {
       DEBUG(D_tls) debug_printf("tls_certificate file %s\n", expanded);
       if (!SSL_CTX_use_certificate_chain_file(ctx, CS expanded))
  -      return tls_error(US"SSL_CTX_use_certificate_chain_file", host);
  +      return tls_error(string_sprintf(
  +        "SSL_CTX_use_certificate_chain_file file=%s", expanded), host);
       }


     if (privatekey != NULL &&
  @@ -392,7 +393,8 @@
       {
       DEBUG(D_tls) debug_printf("tls_privatekey file %s\n", expanded);
       if (!SSL_CTX_use_PrivateKey_file(ctx, CS expanded, SSL_FILETYPE_PEM))
  -      return tls_error(US"SSL_CTX_use_PrivateKey_file", host);
  +      return tls_error(string_sprintf(
  +        "SSL_CTX_use_PrivateKey_file file=%s", expanded), host);
       }
     }



  Index: 210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/210,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 210    8 Oct 2004 14:49:31 -0000    1.1
  +++ 210    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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=smtp X=TLSv1:DES-CBC3-SHA:168 S=201
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLSv1:DES-CBC3-SHA:168 S=202
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1] (SSL_accept): error:140890C7:SSL routines:SSL3_GET_CLIENT_CERTIFICATE:peer did not return a certificate
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtp X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=216
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtps X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=217
   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: 211
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/211,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 211    8 Oct 2004 14:49:31 -0000    1.1
  +++ 211    25 Nov 2004 15:29:37 -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 SMTP on port 1225 (IPv6 and IPv4)
   1999-03-02 09:44:33 H=[::1] F=<ph10@???> rejected RCPT <ph10@???>: unacceptable cipher TLSv1:DES-CBC3-SHA:168
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtp X=TLSv1:DES-CBC3-SHA:168 S=201
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:DES-CBC3-SHA:168 S=218
   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: 216
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/216,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 216    8 Oct 2004 14:49:31 -0000    1.1
  +++ 216    25 Nov 2004 15:29:37 -0000    1.2
  @@ -11,9 +11,9 @@


******** 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=esmtp X=TLSv1:AES256-SHA:256 S=490 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=esmtp X=TLSv1:AES256-SHA:256 S=461 id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtp X=TLSv1:AES256-SHA:256 S=469 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=TLSv1:AES256-SHA:256 S=491 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=TLSv1:AES256-SHA:256 S=462 id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLSv1:AES256-SHA:256 S=470 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: 218
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/218,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 218    8 Oct 2004 14:49:31 -0000    1.1
  +++ 218    25 Nov 2004 15:29:37 -0000    1.2
  @@ -7,4 +7,4 @@


******** 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=esmtp X=TLSv1:AES256-SHA:256 S=464 id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [::1] P=esmtps X=TLSv1:AES256-SHA:256 S=465 id=E10HmaX-0005vi-00@???

  Index: 219
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/219,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 219    8 Oct 2004 14:49:31 -0000    1.1
  +++ 219    25 Nov 2004 15:29:37 -0000    1.2
  @@ -8,4 +8,4 @@
   ******** 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] (SSL_accept): error:1408A0B6:SSL routines:SSL3_GET_CLIENT_HELLO:no ciphers passed
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtp X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=479 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=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=480 id=E10HmaX-0005vi-00@???


  Index: 220
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/220,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 220    8 Oct 2004 14:49:31 -0000    1.1
  +++ 220    25 Nov 2004 15:29:37 -0000    1.2
  @@ -9,4 +9,4 @@
   ******** 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] (SSL_accept): error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtp X=TLSv1:AES256-SHA:256 CV=yes DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=477 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=TLSv1:AES256-SHA:256 CV=yes DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=478 id=E10HmaX-0005vi-00@???


  Index: 221
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/221,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 221    8 Oct 2004 14:49:31 -0000    1.1
  +++ 221    25 Nov 2004 15:29:37 -0000    1.2
  @@ -10,8 +10,8 @@
   ******** 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=esmtp X=TLSv1:AES256-SHA:256 S=490 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=esmtp X=TLSv1:AES256-SHA:256 S=490 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=TLSv1:AES256-SHA:256 S=491 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=TLSv1:AES256-SHA:256 S=491 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: 222
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/222,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 222    8 Oct 2004 14:49:31 -0000    1.1
  +++ 222    25 Nov 2004 15:29:37 -0000    1.2
  @@ -9,8 +9,8 @@


******** 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=asmtp X=TLSv1:AES256-SHA:256 A=plain:ph10 S=484 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=asmtp X=TLSv1:AES256-SHA:256 A=plain:ph10 S=484 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=TLSv1:AES256-SHA:256 A=plain:ph10 S=486 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=TLSv1:AES256-SHA:256 A=plain:ph10 S=486 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: 223
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/223,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 223    8 Oct 2004 14:49:31 -0000    1.1
  +++ 223    25 Nov 2004 15:29:37 -0000    1.2
  @@ -6,7 +6,7 @@


******** 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=esmtp X=TLSv1:DHE-RSA-AES256-SHA:256 S=490 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=TLSv1:DHE-RSA-AES256-SHA:256 S=491 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: 224
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/224,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 224    8 Oct 2004 14:49:31 -0000    1.1
  +++ 224    25 Nov 2004 15:29:37 -0000    1.2
  @@ -6,4 +6,4 @@


******** 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=esmtp X=TLSv1:AES256-SHA:256 S=482 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=TLSv1:AES256-SHA:256 S=483 id=E10HmaX-0005vi-00@???

  Index: 225
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/225,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 225    8 Oct 2004 14:49:31 -0000    1.1
  +++ 225    25 Nov 2004 15:29:37 -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 SMTP on port 1225 (IPv6 and IPv4)
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1] (SSL_accept): error:140890C7:SSL routines:SSL3_GET_CLIENT_CERTIFICATE:peer did not return a certificate
  -1999-03-02 09:44:33 H=[127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: certificate not verified: peerdn=
  +1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: certificate not verified: peerdn=
   1999-03-02 09:44:33 SSL verify error: depth=0 error=self signed certificate cert=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1] (SSL_accept): error:140890B2:SSL routines:SSL3_GET_CLIENT_CERTIFICATE:no certificate returned
   1999-03-02 09:44:33 SSL verify error: depth=0 error=self signed certificate cert=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel


  Index: 264
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/264,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 264    8 Oct 2004 14:49:31 -0000    1.1
  +++ 264    25 Nov 2004 15:29:37 -0000    1.2
  @@ -9,8 +9,8 @@


******** 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=asmtp X=TLSv1:AES256-SHA:256 A=plain:ph10 S=484 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=asmtp X=TLSv1:AES256-SHA:256 A=plain:ph10 S=484 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=TLSv1:AES256-SHA:256 A=plain:ph10 S=486 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=TLSv1:AES256-SHA:256 A=plain:ph10 S=486 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: 297
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/297,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 297    8 Oct 2004 14:49:31 -0000    1.1
  +++ 297    25 Nov 2004 15:29:37 -0000    1.2
  @@ -9,8 +9,8 @@


******** 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=esmtp X=TLSv1:AES256-SHA:256 S=484 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=esmtp X=TLSv1:AES256-SHA:256 S=484 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=TLSv1:AES256-SHA:256 S=485 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=TLSv1:AES256-SHA:256 S=485 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: 321
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/321,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 321    8 Oct 2004 14:49:31 -0000    1.1
  +++ 321    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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=smtp X=TLSv1:DES-CBC3-SHA:168 S=201
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=[127.0.0.1] P=smtps X=TLSv1:DES-CBC3-SHA:168 S=202
   1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: "You must encrypt"


  Index: 391
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/391,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391    8 Oct 2004 14:49:31 -0000    1.1
  +++ 391    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,5 +1,5 @@
   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=esmtp X=TLSv1:DES-CBC3-SHA:168 S=218
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:DES-CBC3-SHA:168 S=219
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=[::1] P=smtp X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel" S=216
   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


  Index: 550
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/550,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 550    8 Oct 2004 14:49:31 -0000    1.1
  +++ 550    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,3 +1,5 @@
   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 SSL verify error: depth=0 error=self signed certificate cert=/C=UK/L=Cambridge/O=University of Cambridge/OU=Computing Service/CN=Philip Hazel
   1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [::1] (SSL_accept): error:140890B2:SSL routines:SSL3_GET_CLIENT_CERTIFICATE:no certificate returned
  +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] (SSL_CTX_use_certificate_chain_file file=/non/exist): error:02001002:system library:fopen:No such file or directory


  Index: 561
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/561,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 561    8 Oct 2004 14:49:31 -0000    1.1
  +++ 561    25 Nov 2004 15:29:37 -0000    1.2
  @@ -8,4 +8,4 @@
   ******** 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] (SSL_accept): error:1408A0C1:SSL routines:SSL3_GET_CLIENT_HELLO:no shared cipher
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=localhost (myhost.test.ex) [127.0.0.1] U=exim P=esmtp X=TLSv1:DES-CBC3-SHA:168 CV=no S=479 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=TLSv1:DES-CBC3-SHA:168 CV=no S=480 id=E10HmaX-0005vi-00@???


  Index: 210.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/210.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 210.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 210.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,6 +1,6 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1]
  -    by myhost.test.ex with smtp (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with smtps (TLSv1:DES-CBC3-SHA:168)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -11,7 +11,7 @@


   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [::1]
  -    by myhost.test.ex with smtp (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with smtps (TLSv1:DES-CBC3-SHA:168)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 211.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/211.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 211.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 211.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,6 +1,6 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
  -Received: from [127.0.0.1]
  -    by myhost.test.ex with smtp (TLSv1:DES-CBC3-SHA:168)
  +Received: from [127.0.0.1] (helo=rhu.barb)
  +    by myhost.test.ex with smtps (TLSv1:DES-CBC3-SHA:168)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 216.abcd
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/216.abcd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 216.abcd    8 Oct 2004 14:49:42 -0000    1.1
  +++ 216.abcd    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmbB-0005vi-00
       for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 216.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/216.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 216.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 216.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -16,7 +16,7 @@


   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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (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)


  Index: 216.xyz
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/216.xyz,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 216.xyz    8 Oct 2004 14:49:42 -0000    1.1
  +++ 216.xyz    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (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)


  Index: 221.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/221.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 221.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 221.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -18,7 +18,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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 222.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/222.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 222.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 222.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 asmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtpsa (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -18,7 +18,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 asmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtpsa (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 223.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/223.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 223.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 223.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 esmtp (TLSv1:DHE-RSA-AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:DHE-RSA-AES256-SHA:256)
       (Exim x.yz)
       id 10HmaY-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 264.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/264.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 264.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 264.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 asmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtpsa (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -18,7 +18,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 asmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtpsa (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 297.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/297.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 297.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 297.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmaZ-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
  @@ -18,7 +18,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 esmtp (TLSv1:AES256-SHA:256)
  +    by myhost.test.ex with esmtps (TLSv1:AES256-SHA:256)
       (Exim x.yz)
       id 10HmbA-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 391.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/391.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 391.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 391.ph10    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,6 +1,6 @@
   From ph10@??? Tue Mar 02 09:44:33 1999
   Received: from [127.0.0.1] (helo=rhu.barb)
  -    by myhost.test.ex with esmtp (TLSv1:DES-CBC3-SHA:168)
  +    by myhost.test.ex with esmtps (TLSv1:DES-CBC3-SHA:168)
       (Exim x.yz)
       id 10HmaX-0005vi-00
       for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000


  Index: 225
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/225,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 225    8 Oct 2004 14:49:51 -0000    1.1
  +++ 225    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,3 +1,3 @@
  -1999-03-02 09:44:33 H=[127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: certificate not verified: peerdn=
  +1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<ph10@???> rejected RCPT <ph10@???>: certificate not verified: peerdn=
   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 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: 210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/210,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 210    8 Oct 2004 14:50:08 -0000    1.1
  +++ 210    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,3 +1,4 @@
  +>>> host in hosts_connection_nolog? no (option unset)
   >>> host in host_lookup? no (option unset)
   >>> host in host_reject_connection? no (option unset)
   >>> host in sender_unqualified_hosts? no (option unset)


  Index: 216
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/216,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 216    8 Oct 2004 14:50:08 -0000    1.1
  +++ 216    25 Nov 2004 15:29:37 -0000    1.2
  @@ -1,5 +1,6 @@
   LOG: queue_run MAIN
     Start queue run: pid=pppp -qf
  +delivering 10HmaX-0005vi-00 (queue run pid ppppp)
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
     SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
     SMTP>> EHLO helo.data.changed
  @@ -28,6 +29,7 @@
     => ph10@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 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)
   Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
     SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
     SMTP>> EHLO helo.data.changed


  Index: 211
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/211,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 211    8 Oct 2004 14:50:13 -0000    1.1
  +++ 211    25 Nov 2004 15:29:37 -0000    1.2
  @@ -74,6 +74,9 @@
   SSL info: SSL negotiation finished successfully
   SSL connection using DES-CBC3-SHA
   Succeeded in starting TLS
  +>>> helo rhu.barb
  +??? 250
  +<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
   >>> mail from:<ph10@???>
   ??? 250
   <<< 250 OK


  Index: 225
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/225,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 225    8 Oct 2004 14:50:13 -0000    1.1
  +++ 225    25 Nov 2004 15:29:37 -0000    1.2
  @@ -68,6 +68,9 @@
   SSL info: SSL negotiation finished successfully
   SSL connection using DES-CBC3-SHA
   Succeeded in starting TLS
  +>>> helo rhu.barb
  +??? 250
  +<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
   >>> mail from:<ph10@???>
   ??? 250
   <<< 250 OK


  Index: 230
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/230,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 230    8 Oct 2004 14:50:13 -0000    1.1
  +++ 230    25 Nov 2004 15:29:37 -0000    1.2
  @@ -9,4 +9,5 @@
   250 HELP
   STARTTLS
   220 Go ahead
  +*sleep 2
   End of script


  Index: 550
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/550,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 550    8 Oct 2004 14:50:14 -0000    1.1
  +++ 550    25 Nov 2004 15:29:37 -0000    1.2
  @@ -36,3 +36,30 @@
   pppp:error14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:1046:SSL alert number 48
   Failed to start TLS
   End of script
  +Certificate file = aux/cert2
  +Key file = aux/cert2
  +Connecting to ::1 port 1225 ... connected
  +??? 220
  +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  +>>> ehlo rhu.barb
  +??? 250-
  +<<< 250-myhost.test.ex Hello rhu.barb [::1]
  +??? 250-
  +<<< 250-SIZE 52428800
  +??? 250-
  +<<< 250-PIPELINING
  +??? 250-
  +<<< 250-STARTTLS
  +??? 250
  +<<< 250 HELP
  +>>> starttls
  +??? 454
  +<<< 454 TLS currently unavailable
  +Attempting to start TLS
  +SSL info: before/connect initialization
  +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:
  +Failed to start TLS
  +End of script


  Index: 584
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/584,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 584    8 Oct 2004 14:50:14 -0000    1.1
  +++ 584    25 Nov 2004 15:29:37 -0000    1.2
  @@ -21,7 +21,6 @@
   SSL info: SSLv2/v3 write client hello A
   SSL info: SSLv3 read server hello A
   SSL info: SSLv3 read server certificate A
  -SSL info: SSLv3 read server key exchange A
   SSL info: SSLv3 read server done A
   SSL info: SSLv3 write client key exchange A
   SSL info: SSLv3 write change cipher spec A
  @@ -30,7 +29,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 DES-CBC3-SHA
   Succeeded in starting TLS
   >>> quit
   ??? 221
  @@ -43,7 +42,6 @@
   SSL info: SSLv2/v3 write client hello A
   SSL info: SSLv3 read server hello A
   SSL info: SSLv3 read server certificate A
  -SSL info: SSLv3 read server key exchange A
   SSL info: SSLv3 read server done A
   SSL info: SSLv3 write client key exchange A
   SSL info: SSLv3 write change cipher spec A
  @@ -52,7 +50,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 DES-CBC3-SHA
   Succeeded in starting TLS
   ??? 220
   <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000