X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ce80533b305c56d57cb7ec1484491f191132cf84..7df6163adc1837c48842471307ecb18aaded4530:/test/src/client.c?ds=sidebyside

diff --git a/test/src/client.c b/test/src/client.c
index 5b998e269..c0c017dd3 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -36,6 +36,9 @@ ripped from the openssl ocsp and s_client utilities. */
 #include <unistd.h>
 #include <utime.h>
 
+/* Set to TRUE to enable debug output */
+#define DEBUG if (FALSE)
+
 #ifdef AF_INET6
 #define HAVE_IPV6 1
 #endif
@@ -429,7 +432,7 @@ if (certificate != NULL)
   {
   rc = gnutls_certificate_set_x509_key_file(x509_cred, CS certificate,
     CS privatekey, GNUTLS_X509_FMT_PEM);
-  if (rc < 0) gnutls_error("gnutls_certificate", rc);
+  if (rc < 0) gnutls_error(US"gnutls_certificate", rc);
   }
 
 /* Associate the parameters with the x509 credentials structure. */
@@ -569,19 +572,53 @@ nextinput:
       alarm(timeout);
       if (srv->tls_active)
         {
-        #ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL
+	int error;
+	DEBUG { printf("call SSL_read\n"); fflush(stdout); }
         rc = SSL_read(srv->ssl, inbuffer, bsiz - 1);
-        #endif
-        #ifdef HAVE_GNUTLS
+	DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); }
+	if (rc <= 0)
+          switch (error = SSL_get_error(srv->ssl, rc))
+	    {
+	    case SSL_ERROR_ZERO_RETURN:
+	      break;
+	    case SSL_ERROR_SYSCALL:
+	      printf("%s\n", ERR_error_string(ERR_get_error(), NULL));
+	      rc = -1;
+	      break;
+	    case SSL_ERROR_SSL:
+	      printf("%s\nTLS terminated\n", ERR_error_string(ERR_get_error(), NULL));
+	      SSL_shutdown(srv->ssl);
+	      SSL_free(srv->ssl);
+	      srv->tls_active = FALSE;
+	      {	/* OpenSSL leaves it in restartsys mode */
+	      struct sigaction act = {.sa_handler = sigalrm_handler_flag, .sa_flags = 0};
+	      sigalrm_seen = 1;
+	      sigaction(SIGALRM, &act, NULL);
+	      }
+	      *inptr = 0;
+	      DEBUG { printf("go round\n"); fflush(stdout); }
+	      goto nextinput;
+	    default:
+	      printf("SSL error code %d\n", error);
+	    }
+#endif
+#ifdef HAVE_GNUTLS
         rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
-        #endif
+#endif
         }
       else
-        rc = read(srv->sock, inbuffer, bsiz);
+	{
+	DEBUG { printf("call read\n"); fflush(stdout); }
+	rc = read(srv->sock, inbuffer, bsiz);
+	DEBUG { printf("read: %d\n", rc); fflush(stdout); }
+	}
       alarm(0);
 
       if (rc < 0)
 	{
+	if (errno == EINTR && sigalrm_seen && resp_optional)
+	  continue;	/* next scriptline */
         printf("Read error %s\n", strerror(errno));
         exit(81);
 	}
@@ -591,6 +628,8 @@ nextinput:
           printf("Expected EOF read\n");
 	  continue;
 	  }
+	else if (resp_optional)
+	  continue;	/* next scriptline */
 	else
 	  {
 	  printf("Unexpected EOF read\n");
@@ -609,6 +648,7 @@ nextinput:
         inptr = inbuffer;
         }
       }
+    DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); }
 
     lineptr = inptr;
     while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++;
@@ -631,12 +671,19 @@ nextinput:
 	exit(79);
 	}
 
-    /* input matched script */
+    /* Input matched script.  Output the inputline, unless optional  */
+    DEBUG { printf("read matched\n"); fflush(stdout); }
+
+    if (!resp_optional)
+	printf("<<< %s\n", lineptr);
+    else
 
-    if (resp_optional)
-      goto nextinput;		/* consume inputline, not scriptline */
+    /* If there is further input after this line, consume inputline but not
+    scriptline in case there are several matching.  Nonmatches are dealt with
+    above. */
 
-    printf("<<< %s\n", lineptr);
+	if (*inptr != 0)
+	  goto nextinput;
 
     #ifdef HAVE_TLS
     if (srv->sent_starttls)
@@ -1169,7 +1216,7 @@ SSL_CTX_set_info_callback(srv.ctx, (void (*)())info_callback);
 #ifdef HAVE_GNUTLS
 if (certfile != NULL) printf("Certificate file = %s\n", certfile);
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);
-tls_init(certfile, keyfile);
+tls_init(US certfile, US keyfile);
 tls_session = tls_session_init();
 #ifdef HAVE_OCSP
 if (ocsp_stapling)