From 9078840563ffbb46c5a06f3eb94e5742e3ede07c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 27 Oct 2018 16:04:43 +0100 Subject: [PATCH] Testsuite: resulting output changes. Broken-by: fd3cf78930 --- test/src/client.c | 28 +++++++++++++++++++++++----- test/stdout/2114 | 9 +++++++-- test/stdout/2124 | 5 +++++ test/stdout/2132 | 15 +++++++++++++-- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/test/src/client.c b/test/src/client.c index c143739d0..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 #include +/* Set to TRUE to enable debug output */ +#define DEBUG if (FALSE) + #ifdef AF_INET6 #define HAVE_IPV6 1 #endif @@ -571,7 +574,9 @@ nextinput: { #ifdef HAVE_OPENSSL int error; + DEBUG { printf("call SSL_read\n"); fflush(stdout); } rc = SSL_read(srv->ssl, inbuffer, bsiz - 1); + DEBUG { printf("SSL_read: %d\n", rc); fflush(stdout); } if (rc <= 0) switch (error = SSL_get_error(srv->ssl, rc)) { @@ -592,6 +597,7 @@ nextinput: sigaction(SIGALRM, &act, NULL); } *inptr = 0; + DEBUG { printf("go round\n"); fflush(stdout); } goto nextinput; default: printf("SSL error code %d\n", error); @@ -602,7 +608,11 @@ nextinput: #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) @@ -638,6 +648,7 @@ nextinput: inptr = inbuffer; } } + DEBUG { printf("read: '%s'\n", inptr); fflush(stdout); } lineptr = inptr; while (*inptr != 0 && *inptr != '\r' && *inptr != '\n') inptr++; @@ -660,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) diff --git a/test/stdout/2114 b/test/stdout/2114 index 2a26dd128..dc6cda0e3 100644 --- a/test/stdout/2114 +++ b/test/stdout/2114 @@ -22,12 +22,13 @@ Attempting to start TLS pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS >>> noop +????554 Security failure +>>> noop ??? 554 Security failure <<< 554 Security failure >>> quit ????554 Security failure -??? 221 -<<< 221 myhost.test.ex closing connection +????221 ???* Expected EOF read End of script @@ -163,6 +164,8 @@ Attempting to start TLS pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48 Failed to start TLS >>> noop +????554 Security failure +>>> noop ??? 554 Security failure <<< 554 Security failure End of script @@ -227,6 +230,8 @@ Attempting to start TLS pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:[...]:SSL alert number 44 Failed to start TLS >>> noop +????554 Security failure +>>> noop ??? 554 Security failure <<< 554 Security failure End of script diff --git a/test/stdout/2124 b/test/stdout/2124 index 166f39657..0d117433e 100644 --- a/test/stdout/2124 +++ b/test/stdout/2124 @@ -22,6 +22,11 @@ Key file = aux-fixed/cert2 Attempting to start TLS pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48 Failed to start TLS +>>> noop +????554 Security failure +>>> noop +??? 554 Security failure +<<< 554 Security failure End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Certificate file = aux-fixed/cert2 diff --git a/test/stdout/2132 b/test/stdout/2132 index 905dfb913..04ff48bbf 100644 --- a/test/stdout/2132 +++ b/test/stdout/2132 @@ -1,3 +1,4 @@ +### Should accept message Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -37,6 +38,7 @@ Succeeded in starting TLS ??? 221 <<< 221 myhost.test.ex closing connection End of script +### Should accept message (with a difficult env-from) Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -76,6 +78,7 @@ Succeeded in starting TLS ??? 221 <<< 221 myhost.test.ex closing connection End of script +### client cert verify required; none given Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -98,11 +101,13 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Attempting to start TLS pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS -+++ 1 ->>> help +>>> noop +????554 +>>> noop ??? 554 <<< 554 Security failure End of script +### client cert verify required; good one supplied Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key @@ -152,3 +157,9 @@ End of script 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 503 STARTTLS command used when not advertised 221 myhost.test.ex closing connection + +******** SERVER ******** +### Should accept message +### Should accept message (with a difficult env-from) +### client cert verify required; none given +### client cert verify required; good one supplied -- 2.30.2