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 614c2c557b16bd8d8539d69b81d20cf48a3ebee9..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>


@@ -58,7 +59,6 @@ static int sigalrm_seen = 0;
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */

-

 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>
 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>


@@ -67,7 +67,14 @@ latter needs a whole pile of tables. */
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>

-# include <openssl/ocsp.h>
+
+# if OPENSSL_VERSION_NUMBER < 0x0090806fL && !defined(DISABLE_OCSP) && !defined(OPENSSL_NO_TLSEXT)
+#  warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile"
+#  define DISABLE_OCSP
+# endif
+# ifndef DISABLE_OCSP
+#  include <openssl/ocsp.h>
+# endif

 #endif
 
 
 #endif
 
 


@@ -79,20 +86,24 @@ latter needs a whole pile of tables. */
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
 # endif
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
 # endif

+# ifndef GNUTLS_NO_EXTENSIONS
+#  define GNUTLS_NO_EXTENSIONS 0
+# endif

 
 # define DH_BITS      768
 
 /* Local static variables for GNUTLS */
 
 
 # define DH_BITS      768
 
 /* Local static variables for GNUTLS */
 

-static gnutls_dh_params dh_params = NULL;
+static gnutls_dh_params_t dh_params = NULL;

 
 static gnutls_certificate_credentials_t x509_cred = NULL;
 
 static gnutls_certificate_credentials_t x509_cred = NULL;

-static gnutls_session tls_session = NULL;
+static gnutls_session_t tls_session = NULL;

 
 static int  ssl_session_timeout = 200;
 
 /* Priorities for TLS algorithms to use. */
 
 
 static int  ssl_session_timeout = 200;
 
 /* Priorities for TLS algorithms to use. */
 

+#if GNUTLS_VERSION_NUMBER < 0x030400

 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
 
 static const int kx_priority[16] = {
 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
 
 static const int kx_priority[16] = {


@@ -114,7 +125,7 @@ static const int mac_priority[16] = {
   0 };
 
 static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
   0 };
 
 static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };

-static const int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 };
+#endif

 
 #endif /*HAVE_GNUTLS*/
 
 
 #endif /*HAVE_GNUTLS*/
 


@@ -155,36 +166,30 @@ sigalrm_seen = 1;
 /****************************************************************************/
 
 #ifdef HAVE_OPENSSL
 /****************************************************************************/
 
 #ifdef HAVE_OPENSSL

+# ifndef DISABLE_OCSP
+
+static STACK_OF(X509) *
+chain_from_pem_file(const uschar * file)
+{
+BIO * bp;
+X509 * x;
+STACK_OF(X509) * sk;
+
+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;
+}
+

 
 

-X509_STORE *
-setup_verify(BIO *bp, char *CAfile, char *CApath)
+
+static void
+cert_stack_free(STACK_OF(X509) * sk)

 {
 {

-        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;
+while (sk_X509_num(sk) > 0) (void) sk_X509_pop(sk);
+sk_X509_free(sk);

 }
 
 
 }
 
 


@@ -195,8 +200,7 @@ 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;
 
 len = SSL_get_tlsext_status_ocsp_resp(s, &p);
 int ret = 1;
 
 len = SSL_get_tlsext_status_ocsp_resp(s, &p);


@@ -218,15 +222,19 @@ if(!(bs = OCSP_response_get1_basic(rsp)))
   return 0;
   }
 
   return 0;
   }
 

-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;
   }
 

-/* No file of alternate certs, no options */
-if(OCSP_basic_verify(bs, NULL, store, 0) <= 0)
+/* 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
+(in "bs") and a cert-stack "sk" are all that is used. */
+
+if(OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY) <= 0)

   {
   BIO_printf(arg, "Response Verify Failure\n");
   ERR_print_errors(arg);
   {
   BIO_printf(arg, "Response Verify Failure\n");
   ERR_print_errors(arg);


@@ -235,9 +243,10 @@ if(OCSP_basic_verify(bs, NULL, store, 0) <= 0)
 else
   BIO_printf(arg, "Response verify OK\n");
 
 else
   BIO_printf(arg, "Response verify OK\n");
 

-X509_STORE_free(store);
+cert_stack_free(sk);

 return ret;
 }
 return ret;
 }

+# endif        /*DISABLE_OCSP*/

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


@@ -248,21 +257,23 @@ int
 tls_start(int sock, SSL **ssl, SSL_CTX *ctx)
 {
 int rc;
 tls_start(int sock, SSL **ssl, SSL_CTX *ctx)
 {
 int rc;

-static const char *sid_ctx = "exim";
+static const unsigned char *sid_ctx = US"exim";

 
 RAND_load_file("client.c", -1);   /* Not *very* random! */
 
 *ssl = SSL_new (ctx);
 
 RAND_load_file("client.c", -1);   /* Not *very* random! */
 
 *ssl = SSL_new (ctx);

-SSL_set_session_id_context(*ssl, sid_ctx, strlen(sid_ctx));
+SSL_set_session_id_context(*ssl, sid_ctx, strlen(CS sid_ctx));

 SSL_set_fd (*ssl, sock);
 SSL_set_connect_state(*ssl);
 
 SSL_set_fd (*ssl, sock);
 SSL_set_connect_state(*ssl);
 

+#ifndef DISABLE_OCSP

 if (ocsp_stapling)
   {
   SSL_CTX_set_tlsext_status_cb(ctx, tls_client_stapling_cb);
   SSL_CTX_set_tlsext_status_arg(ctx, BIO_new_fp(stdout, BIO_NOCLOSE));
   SSL_set_tlsext_status_type(*ssl, TLSEXT_STATUSTYPE_ocsp);
   }
 if (ocsp_stapling)
   {
   SSL_CTX_set_tlsext_status_cb(ctx, tls_client_stapling_cb);
   SSL_CTX_set_tlsext_status_arg(ctx, BIO_new_fp(stdout, BIO_NOCLOSE));
   SSL_set_tlsext_status_type(*ssl, TLSEXT_STATUSTYPE_ocsp);
   }

+#endif

 
 signal(SIGALRM, sigalrm_handler_flag);
 sigalrm_seen = 0;
 
 signal(SIGALRM, sigalrm_handler_flag);
 sigalrm_seen = 0;


@@ -343,7 +354,7 @@ init_dh(void)
 {
 int fd;
 int ret;
 {
 int fd;
 int ret;

-gnutls_datum m;
+gnutls_datum_t m;

 uschar filename[200];
 struct stat statbuf;
 
 uschar filename[200];
 struct stat statbuf;
 


@@ -436,13 +447,14 @@ if (ocsp_stapling)
 *        Initialize a single GNUTLS session      *
 *************************************************/
 
 *        Initialize a single GNUTLS session      *
 *************************************************/
 

-static gnutls_session
+static gnutls_session_t

 tls_session_init(void)
 {
 tls_session_init(void)
 {

-gnutls_session session;
+gnutls_session_t session;

 
 

-gnutls_init(&session, GNUTLS_CLIENT);
+gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS);

 
 

+#if GNUTLS_VERSION_NUMBER < 0x030400

 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);
 gnutls_kx_set_priority(session, kx_priority);
 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);
 gnutls_kx_set_priority(session, kx_priority);


@@ -450,6 +462,10 @@ gnutls_protocol_set_priority(session, protocol_priority);
 gnutls_mac_set_priority(session, mac_priority);
 
 gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 gnutls_mac_set_priority(session, mac_priority);
 
 gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);

+#else
+gnutls_set_default_priority(session);
+gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
+#endif

 
 gnutls_dh_set_prime_bits(session, DH_BITS);
 gnutls_db_set_cache_expiration(session, ssl_session_timeout);
 
 gnutls_dh_set_prime_bits(session, DH_BITS);
 gnutls_db_set_cache_expiration(session, ssl_session_timeout);


@@ -460,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;
+}
+
+

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


@@ -470,7 +524,14 @@ return session;
 *************************************************/
 
 const char * const HELP_MESSAGE = "\n\
 *************************************************/
 
 const char * const HELP_MESSAGE = "\n\

-Usage: client\n\
+Usage: client\n"
+#ifdef HAVE_TLS
+"\
+          [-tls-on-connect]\n\
+          [-ocsp]\n"
+#endif
+"\
+          [-tn] n seconds timeout\n\

           <IP address>\n\
           <port>\n\
           [<outgoing interface>]\n\
           <IP address>\n\
           <port>\n\
           [<outgoing interface>]\n\


@@ -478,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;


@@ -717,7 +779,7 @@ an externally applied timeout if the signal handler has been run. */
 if (rc < 0)
   {
   close(sock);
 if (rc < 0)
   {
   close(sock);

-  printf("failed: %s\n", strerror(save_errno));
+  printf("connect failed: %s\n", strerror(save_errno));

   exit(85);
   }
 
   exit(85);
   }
 


@@ -774,7 +836,7 @@ tls_session = tls_session_init();
 if (ocsp_stapling)
   gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL);
 #endif
 if (ocsp_stapling)
   gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL);
 #endif

-gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr)sock);
+gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr_t)(intptr_t)sock);

 
 /* When the server asks for a certificate and the client does not have one,
 there is a SIGPIPE error in the gnutls_handshake() function for some reason
 
 /* When the server asks for a certificate and the client does not have one,
 there is a SIGPIPE error in the gnutls_handshake() function for some reason


@@ -795,41 +857,56 @@ if (tls_on_connect)
   {
   printf("Attempting to start TLS\n");
 
   {
   printf("Attempting to start TLS\n");
 

-  #ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL

   tls_active = tls_start(sock, &ssl, ctx);
   tls_active = tls_start(sock, &ssl, ctx);

-  #endif
+#endif

 
 

-  #ifdef HAVE_GNUTLS
+#ifdef HAVE_GNUTLS
+  {
+  int rc;

   sigalrm_seen = FALSE;
   alarm(timeout);
   sigalrm_seen = FALSE;
   alarm(timeout);

-  tls_active = gnutls_handshake(tls_session) >= 0;
+  do {
+    rc = gnutls_handshake(tls_session);
+  } while (rc < 0 && gnutls_error_is_fatal(rc) == 0);
+  tls_active = rc >= 0;

   alarm(0);
   alarm(0);

-  #endif
+
+  if (!tls_active) printf("%s\n", gnutls_strerror(rc));
+  }
+#endif

 
   if (!tls_active)
     printf("Failed to start TLS\n");
 
   if (!tls_active)
     printf("Failed to start TLS\n");

-  #if defined(HAVE_GNUTLS) && defined(HAVE_OCSP)
+#if defined(HAVE_GNUTLS) && defined(HAVE_OCSP)

   else if (  ocsp_stapling
          && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
     printf("Failed to verify certificate status\n");
   else if (  ocsp_stapling
          && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
     printf("Failed to verify certificate status\n");

-  #endif
+#endif

   else
     printf("Succeeded in starting TLS\n");
   }
 #endif
 
   else
     printf("Succeeded in starting TLS\n");
   }
 #endif
 

-while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL)
+while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL)

   {
   {

-  int n = (int)strlen(outbuffer);
-  while (n > 0 && isspace(outbuffer[n-1])) n--;
-  outbuffer[n] = 0;
+  int n = (int)strlen(CS outbuffer);
+  int crlf = 1;
+
+  /* Strip trailing newline */
+  if (outbuffer[n-1] == '\n') outbuffer[--n] = 0;

 
   /* Expect incoming */
 
 
   /* Expect incoming */
 

-  if (strncmp(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 */
       {


@@ -850,15 +927,27 @@ while (fgets(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
         {


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

-    if (strncmp(lineptr, outbuffer + 4, (int)strlen(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);


@@ -898,10 +987,18 @@ int rc;
         #endif
 
         #ifdef HAVE_GNUTLS
         #endif
 
         #ifdef HAVE_GNUTLS

-        sigalrm_seen = FALSE;
-        alarm(timeout);
-        tls_active = gnutls_handshake(tls_session) >= 0;
-        alarm(0);
+         {
+         int rc;
+         sigalrm_seen = FALSE;
+         alarm(timeout);
+         do {
+           rc = gnutls_handshake(tls_session);
+         } while (rc < 0 && gnutls_error_is_fatal(rc) == 0);
+         tls_active = rc >= 0;
+         alarm(0);
+
+         if (!tls_active) printf("%s\n", gnutls_strerror(rc));
+         }

         #endif
 
         if (!tls_active)
         #endif
 
         if (!tls_active)


@@ -958,22 +1055,29 @@ int rc;
 
   /* Wait for a bit before proceeding */
 
 
   /* Wait for a bit before proceeding */
 

-  else if (strncmp(outbuffer, "+++ ", 4) == 0)
+  else if (strncmp(CS outbuffer, "+++ ", 4) == 0)

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

-    sleep(atoi(outbuffer + 4));
+    sleep(atoi(CS outbuffer + 4));

     }
 
   /* Send outgoing, but barf if unconsumed incoming */
 
   else
     {
     }
 
   /* Send outgoing, but barf if unconsumed incoming */
 
   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);
       }
 


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

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

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


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

-    sent_starttls = (strcmp(outbuffer, "starttls") == 0 ||
-                     strcmp(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(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(outbuffer + n, "\r\n");
-
-    /* Turn "\n" and "\r" into the relevant characters. This is a hack. */
-
-    while ((escape = strstr(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 = strstr(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 */
 


@@ -1048,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);


@@ -1060,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)


@@ -1074,6 +1165,8 @@ int rc;
   }
 
 printf("End of script\n");
   }
 
 printf("End of script\n");

+shutdown(sock, SHUT_WR);
+while ((rc = read(sock, inbuffer, sizeof(inbuffer))) > 0) ;

 close(sock);
 
 exit(0);
 close(sock);
 
 exit(0);