Fix logging of drop-after-EHLO-reject.

[exim.git] / test / src / client.c

diff --git a/test/src/client.c b/test/src/client.c
index 5e6b6472ac082565926394d61ee8e805d6dafd98..f34cf784c9a671c0f1d84d24a81da75f648680e3 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -24,6 +24,7 @@ ripped from the openssl ocsp and s_client utilities. */
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>

+#include <netinet/tcp.h>

 
 #include <netdb.h>
 #include <arpa/inet.h>
 
 #include <netdb.h>
 #include <arpa/inet.h>


@@ -165,59 +166,25 @@ sigalrm_seen = 1;
 /****************************************************************************/
 
 #ifdef HAVE_OPENSSL
 /****************************************************************************/
 
 #ifdef HAVE_OPENSSL

+# ifndef DISABLE_OCSP

 
 

-X509_STORE *
-setup_verify(BIO *bp, char *CAfile, char *CApath)
-{
-        X509_STORE *store;
-        X509_LOOKUP *lookup;
-        if(!(store = X509_STORE_new())) goto end;
-        lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
-        if (lookup == NULL) goto end;
-        if (CAfile) {
-                if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) {
-                        BIO_printf(bp, "Error loading file %s\n", CAfile);
-                        goto end;
-                }
-        } else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
-
-        lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
-        if (lookup == NULL) goto end;
-        if (CApath) {
-                if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) {
-                        BIO_printf(bp, "Error loading directory %s\n", CApath);
-                        goto end;
-                }
-        } else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-
-        ERR_clear_error();
-        return store;
-        end:
-        X509_STORE_free(store);
-        return NULL;
-}
-
-
-#ifndef DISABLE_OCSP

 static STACK_OF(X509) *
 static STACK_OF(X509) *

-cert_stack_from_store(X509_STORE * store)
+chain_from_pem_file(const uschar * file)

 {
 {

-STACK_OF(X509_OBJECT) * roots= store->objs;
-STACK_OF(X509) * sk = sk_X509_new_null();
-int i;
+BIO * bp;
+X509 * x;
+STACK_OF(X509) * sk;

 
 

-for(i = sk_X509_OBJECT_num(roots) - 1; i >= 0; i--)
-  {
-  X509_OBJECT * tmp_obj= sk_X509_OBJECT_value(roots, i);
-  if(tmp_obj->type == X509_LU_X509)
-    {
-    X509 * x = tmp_obj->data.x509;
-    sk_X509_push(sk, x);
-    }
-  }
+if (!(sk = sk_X509_new_null())) return NULL;
+if (!(bp = BIO_new_file(CS file, "r"))) return NULL;
+while ((x = PEM_read_bio_X509(bp, NULL, 0, NULL)))
+  sk_X509_push(sk, x);
+BIO_free(bp);

 return sk;
 }
 
 return sk;
 }
 

+
+

 static void
 cert_stack_free(STACK_OF(X509) * sk)
 {
 static void
 cert_stack_free(STACK_OF(X509) * sk)
 {


@@ -233,8 +200,6 @@ const unsigned char *p;
 int len;
 OCSP_RESPONSE *rsp;
 OCSP_BASICRESP *bs;
 int len;
 OCSP_RESPONSE *rsp;
 OCSP_BASICRESP *bs;

-char *CAfile = NULL;
-X509_STORE *store = NULL;

 STACK_OF(X509) * sk;
 int ret = 1;
 
 STACK_OF(X509) * sk;
 int ret = 1;
 


@@ -258,15 +223,12 @@ if(!(bs = OCSP_response_get1_basic(rsp)))
   }
 
 
   }
 
 

-CAfile = ocsp_stapling;
-if(!(store = setup_verify(arg, CAfile, NULL)))
+if (!(sk = chain_from_pem_file(ocsp_stapling)))

   {
   BIO_printf(arg, "error in cert setup\n");
   return 0;
   }
 
   {
   BIO_printf(arg, "error in cert setup\n");
   return 0;
   }
 

-sk = cert_stack_from_store(store);
-

 /* OCSP_basic_verify takes a "store" arg, but does not
 use it for the chain verification, which is all we do
 when OCSP_NOVERIFY is set.  The content from the wire
 /* OCSP_basic_verify takes a "store" arg, but does not
 use it for the chain verification, which is all we do
 when OCSP_NOVERIFY is set.  The content from the wire


@@ -282,10 +244,9 @@ else
   BIO_printf(arg, "Response verify OK\n");
 
 cert_stack_free(sk);
   BIO_printf(arg, "Response verify OK\n");
 
 cert_stack_free(sk);

-X509_STORE_free(store);

 return ret;
 }
 return ret;
 }

-#endif
+# endif        /*DISABLE_OCSP*/

 
 
 /*************************************************
 
 
 /*************************************************


@@ -515,6 +476,44 @@ return session;
 
 
 /****************************************************************************/
 
 
 /****************************************************************************/

+/* Turn "\n" and "\r" into the relevant characters. This is a hack. */
+
+static int
+unescape_buf(unsigned char * buf, int len)
+{
+unsigned char * s;
+unsigned char c, t;
+unsigned shift;
+
+for (s = buf; s < buf+len; s++) if (*s == '\\')
+  {
+  switch (s[1])
+    {
+    default:   c = s[1]; shift = 1; break;
+    case 'n':  c = '\n'; shift = 1; break;
+    case 'r':  c = '\r'; shift = 1; break;
+    case 'x':
+               t = s[2];
+               if (t >= 'A' && t <= 'F') t -= 'A'-'9'-1;
+               else if (t >= 'a' && t <= 'f') t -= 'a'-'9'-1;
+               t -= '0';
+               c = (t<<4) & 0xf0;
+               t = s[3];
+               if (t >= 'A' && t <= 'F') t -= 'A'-'9'-1;
+               else if (t >= 'a' && t <= 'f') t -= 'a'-'9'-1;
+               t -= '0';
+               c |= t & 0xf;
+               shift = 3;
+               break;
+    }
+  *s = c;
+  memmove(s+1, s+shift+1, len-shift);
+  len -= shift;
+  }
+return len;
+}
+
+

 /****************************************************************************/
 
 
 /****************************************************************************/
 
 


@@ -540,7 +539,8 @@ Usage: client\n"
           [<key file>]\n\
 \n";
 
           [<key file>]\n\
 \n";
 

-int main(int argc, char **argv)
+int
+main(int argc, char **argv)

 {
 struct sockaddr *s_ptr;
 struct sockaddr_in s_in4;
 {
 struct sockaddr *s_ptr;
 struct sockaddr_in s_in4;


@@ -891,16 +891,22 @@ if (tls_on_connect)
 while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL)
   {
   int n = (int)strlen(CS outbuffer);
 while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL)
   {
   int n = (int)strlen(CS outbuffer);

+  int crlf = 1;

 
   /* Strip trailing newline */
   if (outbuffer[n-1] == '\n') outbuffer[--n] = 0;
 
   /* Expect incoming */
 
 
   /* Strip trailing newline */
   if (outbuffer[n-1] == '\n') outbuffer[--n] = 0;
 
   /* Expect incoming */
 

-  if (strncmp(CS outbuffer, "??? ", 4) == 0)
+  if (  strncmp(CS outbuffer, "???", 3) == 0
+     && (outbuffer[3] == ' ' || outbuffer[3] == '*')
+     )

     {
     unsigned char *lineptr;
     {
     unsigned char *lineptr;

+    unsigned exp_eof = outbuffer[3] == '*';
+

     printf("%s\n", outbuffer);
     printf("%s\n", outbuffer);

+    n = unescape_buf(outbuffer, n);

 
     if (*inptr == 0)   /* Refill input buffer */
       {
 
     if (*inptr == 0)   /* Refill input buffer */
       {


@@ -921,15 +927,27 @@ while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL)
         }
 
       if (rc < 0)
         }
 
       if (rc < 0)

-        {
+       {

         printf("Read error %s\n", strerror(errno));
         printf("Read error %s\n", strerror(errno));

-        exit(81)  ;
-        }
+        exit(81);
+       }

       else if (rc == 0)
       else if (rc == 0)

+       if (exp_eof)
+         {
+          printf("Expected EOF read\n");
+         continue;
+         }
+       else
+         {
+         printf("Unexpected EOF read\n");
+         close(sock);
+         exit(80);
+         }
+      else if (exp_eof)

         {
         {

-        printf("Unexpected EOF read\n");
+        printf("Expected EOF not read\n");

         close(sock);
         close(sock);

-        exit(80);
+        exit(74);

         }
       else
         {
         }
       else
         {


@@ -947,7 +965,7 @@ while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL)
       }
 
     printf("<<< %s\n", lineptr);
       }
 
     printf("<<< %s\n", lineptr);

-    if (strncmp(CS lineptr, CS outbuffer + 4, (int)strlen(CS outbuffer) - 4) != 0)
+    if (strncmp(CS lineptr, CS outbuffer + 4, n - 4) != 0)

       {
       printf("\n******** Input mismatch ********\n");
       exit(79);
       {
       printf("\n******** Input mismatch ********\n");
       exit(79);


@@ -1047,12 +1065,19 @@ int rc;
 
   else
     {
 
   else
     {

-    unsigned char *escape;
+    unsigned char * out = outbuffer;
+
+    if (strncmp(CS outbuffer, ">>> ", 4) == 0)
+      {
+      crlf = 0;
+      out += 4;
+      n -= 4;
+      }

 
     if (*inptr != 0)
       {
       printf("Unconsumed input: %s", inptr);
 
     if (*inptr != 0)
       {
       printf("Unconsumed input: %s", inptr);

-      printf("   About to send: %s\n", outbuffer);
+      printf("   About to send: %s\n", out);

       exit(78);
       }
 
       exit(78);
       }
 


@@ -1060,8 +1085,8 @@ int rc;
 
     /* Shutdown TLS */
 
 
     /* Shutdown TLS */
 

-    if (strcmp(CS outbuffer, "stoptls") == 0 ||
-        strcmp(CS outbuffer, "STOPTLS") == 0)
+    if (strcmp(CS out, "stoptls") == 0 ||
+        strcmp(CS out, "STOPTLS") == 0)

       {
       if (!tls_active)
         {
       {
       if (!tls_active)
         {


@@ -1088,38 +1113,28 @@ int rc;
 
     /* Remember that we sent STARTTLS */
 
 
     /* Remember that we sent STARTTLS */
 

-    sent_starttls = (strcmp(CS outbuffer, "starttls") == 0 ||
-                     strcmp(CS outbuffer, "STARTTLS") == 0);
+    sent_starttls = (strcmp(CS out, "starttls") == 0 ||
+                     strcmp(CS out, "STARTTLS") == 0);

 
     /* Fudge: if the command is "starttls_wait", we send the starttls bit,
     but we haven't set the flag, so that there is no negotiation. This is for
     testing the server's timeout. */
 
 
     /* Fudge: if the command is "starttls_wait", we send the starttls bit,
     but we haven't set the flag, so that there is no negotiation. This is for
     testing the server's timeout. */
 

-    if (strcmp(CS outbuffer, "starttls_wait") == 0)
+    if (strcmp(CS out, "starttls_wait") == 0)

       {
       {

-      outbuffer[8] = 0;
+      out[8] = 0;

       n = 8;
       }
     #endif
 
       n = 8;
       }
     #endif
 

-    printf(">>> %s\n", outbuffer);
-    strcpy(CS outbuffer + n, "\r\n");
-
-    /* Turn "\n" and "\r" into the relevant characters. This is a hack. */
-
-    while ((escape = US strstr(CS outbuffer, "\\r")) != NULL)
+    printf(">>> %s\n", out);
+    if (crlf)

       {
       {

-      *escape = '\r';
-      memmove(escape + 1, escape + 2,  (n + 2) - (escape - outbuffer) - 2);
-      n--;
+      strcpy(CS out + n, "\r\n");
+      n += 2;

       }
 
       }
 

-    while ((escape = US strstr(CS outbuffer, "\\n")) != NULL)
-      {
-      *escape = '\n';
-      memmove(escape + 1, escape + 2,  (n + 2) - (escape - outbuffer) - 2);
-      n--;
-      }
+    n = unescape_buf(out, n);

 
     /* OK, do it */
 
 
     /* OK, do it */
 


@@ -1127,11 +1142,10 @@ int rc;
     if (tls_active)
       {
       #ifdef HAVE_OPENSSL
     if (tls_active)
       {
       #ifdef HAVE_OPENSSL

-        rc = SSL_write (ssl, outbuffer, n + 2);
+        rc = SSL_write (ssl, out, n);

       #endif
       #ifdef HAVE_GNUTLS
       #endif
       #ifdef HAVE_GNUTLS

-        rc = gnutls_record_send(tls_session, CS outbuffer, n + 2);
-        if (rc < 0)
+        if ((rc = gnutls_record_send(tls_session, CS out, n)) < 0)

           {
           printf("GnuTLS write error: %s\n", gnutls_strerror(rc));
           exit(76);
           {
           printf("GnuTLS write error: %s\n", gnutls_strerror(rc));
           exit(76);


@@ -1139,9 +1153,7 @@ int rc;
       #endif
       }
     else
       #endif
       }
     else

-      {
-      rc = write(sock, outbuffer, n + 2);
-      }
+      rc = write(sock, out, n);

     alarm(0);
 
     if (rc < 0)
     alarm(0);
 
     if (rc < 0)