diff options
67 files changed, 531 insertions, 2741 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 0ab13c70e..02ffec9d1 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -45,7 +45,7 @@ . Update the Copyright year (only) when changing content. . ///////////////////////////////////////////////////////////////////////////// -.set previousversion "4.87" +.set previousversion "4.88" .include ./local_params .set ACL "access control lists (ACLs)" @@ -371,13 +371,11 @@ contributors. .section "Exim documentation" "SECID1" . Keep this example change bar when updating the documentation! -.new .cindex "documentation" This edition of the Exim specification applies to version &version() of Exim. Substantive changes from the &previousversion; edition are marked in some renditions of the document; this paragraph is so marked if the rendition is capable of showing a change indicator. -.wen This document is very much a reference manual; it is not a tutorial. The reader is expected to have some familiarity with the SMTP mail transfer protocol and @@ -3827,13 +3825,11 @@ This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option. It signifies that the remote host supports the ESMTP &_DSN_& extension. -.new .vitem &%-MCG%& .oindex "&%-MCG%&" This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option. It signifies that an alternate queue is used, named by the following option. -.wen .vitem &%-MCP%& .oindex "&%-MCP%&" @@ -4381,9 +4377,7 @@ relax this restriction (and also the same requirement for the &%-M%&, &%-R%&, and &%-S%& options). .cindex "queue runner" "description of operation" -.new If other commandline options do not specify an action, -.wen the &%-q%& option starts one queue runner process. This scans the queue of waiting messages, and runs a delivery process for each one in turn. It waits for each delivery process to finish before starting the next one. A delivery @@ -4469,7 +4463,6 @@ The &'l'& (the letter &"ell"&) flag specifies that only local deliveries are to be done. If a message requires any remote deliveries, it remains on the queue for later delivery. -.new .vitem &%-q[q][i][f[f]][l][G<name>[/<time>]]]%& .oindex "&%-qG%&" .cindex queue named @@ -4489,7 +4482,6 @@ exim -bp -qGquarantine mailq -qGquarantime exim -qGoffpeak -Rf @special.domain.example .endd -.wen .vitem &%-q%&<&'qflags'&>&~<&'start&~id'&>&~<&'end&~id'&> When scanning the queue, Exim can be made to skip over messages whose ids are @@ -5038,7 +5030,6 @@ address lists. In Exim 4 these are handled better by named lists &-- see section &<<SECTnamedlists>>&. -.new .section "Builtin macros" "SECTbuiltinmacros" Exim defines some macros depending on facilities available, which may differ due to build-time definitions and from one release to another. @@ -5048,15 +5039,20 @@ They can be used to conditionally include parts of a configuration The following classes of macros are defined: .display -&` _HAVE_ `& build-time defines -&` _DRVR_AUTH_ `& authehticator drivers -&` _DRVR_RTR_ `& router drivers -&` _DRVR_TPT_ `& transport drivers -&` _OPT_ `& configuration option support +&` _HAVE_* `& build-time defines +&` _DRIVER_ROUTER_* `& router drivers +&` _DRIVER_TRANSPORT_* `& transport drivers +&` _DRIVER_AUTHENTICATOR_* `& authenticator drivers +&` _OPT_MAIN_* `& main config options +&` _OPT_ROUTERS_* `& generic router options +&` _OPT_TRANSPORTS_* `& generic transport options +&` _OPT_AUTHENTICATORS_* `& generic authenticator options +&` _OPT_ROUTER_*_* `& private router options +&` _OPT_TRANSPORT_*_* `& private transport options +&` _OPT_AUTHENTICATOR_*_* `& private authenticator options .endd Use an &"exim -bP macros"& command to get the list of macros. -.wen .section "Conditional skips in the configuration file" "SECID46" @@ -5163,9 +5159,7 @@ hexadecimal number. If an integer value is followed by the letter K, it is multiplied by 1024; if it is followed by the letter M, it is multiplied by 1024x1024; -.new if by the letter G, 1024x1024x1024. -.wen When the values of integer option settings are output, values which are an exact multiple of 1024 or 1024x1024 are sometimes, but not always, printed using the letters K @@ -6295,9 +6289,7 @@ Exim supports the use of regular expressions in many of its options. It uses the PCRE regular expression library; this provides regular expression matching that is compatible with Perl 5. The syntax and semantics of regular expressions is discussed in -.new online Perl manpages, in -.wen many Perl reference books, and also in Jeffrey Friedl's &'Mastering Regular Expressions'&, which is published by O'Reilly (see &url(http://www.oreilly.com/catalog/regex2/)). @@ -7845,10 +7837,8 @@ domain, host, address and local part lists. .cindex "expansion" "of lists" Each list is expanded as a single string before it is used. -.new &'Exception: the router headers_remove option, where list-item splitting is done before string-expansion.'& -.wen The result of expansion must be a list, possibly containing empty items, which is split up @@ -9432,12 +9422,19 @@ message, and any that are added by an ACL statement or by a system filter. Header lines that are added to a particular copy of a message by a router or transport are not accessible. -For incoming SMTP messages, no header lines are visible in ACLs that are obeyed -before the DATA ACL, because the header structure is not set up until the -message is received. Header lines that are added in a RCPT ACL (for example) +For incoming SMTP messages, no header lines are visible in +.new +ACLs that are obeyed before the data phase completes, +.wen +because the header structure is not set up until the message is received. +They are visible in DKIM, PRDR and DATA ACLs. +Header lines that are added in a RCPT ACL (for example) are saved until the message's incoming header lines are available, at which -point they are added. When a DATA ACL is running, however, header lines added -by earlier ACLs are visible. +point they are added. +.new +When any of the above ACLs ar +.wen +running, however, header lines added by earlier ACLs are visible. Upper case and lower case letters are synonymous in header names. If the following character is white space, the terminating colon may be omitted, but @@ -10126,7 +10123,6 @@ Last:user@example.com user@example.com .endd -.new .vitem &*${base32:*&<&'digits'&>&*}*& .cindex "&%base32%& expansion item" .cindex "expansion" "conversion to base 32" @@ -10139,7 +10135,6 @@ Only lowercase letters are used. .cindex "expansion" "conversion to base 32" The string must consist entirely of base-32 digits. The number is converted to decimal and output as a string. -.wen .vitem &*${base62:*&<&'digits'&>&*}*& .cindex "&%base62%& expansion item" @@ -10192,14 +10187,12 @@ escape sequences starting with a backslash. Whether characters with the most significant bit set (so-called &"8-bit characters"&) count as printing or not is controlled by the &%print_topbitchars%& option. -.new .vitem &*${escape8bit:*&<&'string'&>&*}*& .cindex "expansion" "escaping 8-bit characters" .cindex "&%escape8bit%& expansion item" If the string contains and characters with the most significant bit set, they are converted to escape sequences starting with a backslash. Backslashes and DEL characters are also converted. -.wen .vitem &*${eval:*&<&'string'&>&*}*&&~and&~&*${eval10:*&<&'string'&>&*}*& @@ -10587,17 +10580,14 @@ returns the SHA-1 hash fingerprint of the certificate. .cindex certificate fingerprint .cindex "expansion" "SHA-256 hashing" .cindex "&%sha256%& expansion item" -.new The &%sha256%& operator computes the SHA-256 hash value of the string and returns it as a 64-digit hexadecimal number, in which any letters are in upper case. -.wen If the string is a single variable of type certificate, returns the SHA-256 hash fingerprint of the certificate. -.new .vitem &*${sha3:*&<&'string'&>&*}*& &&& &*${sha3_<n>:*&<&'string'&>&*}*& .cindex "SHA3 hash" @@ -10613,7 +10603,6 @@ with 256 being the default. The &%sha3%& expansion item is only supported if Exim has been compiled with GnuTLS 3.5.0 or later. -.wen .vitem &*${stat:*&<&'string'&>&*}*& @@ -12262,7 +12251,6 @@ a single-component name, Exim calls &[gethostbyname()]& (or qualified host name. See also &$smtp_active_hostname$&. -.new .vitem &$proxy_external_address$& &&& &$proxy_external_port$& &&& &$proxy_local_address$& &&& @@ -12271,7 +12259,6 @@ qualified host name. See also &$smtp_active_hostname$&. These variables are only available when built with Proxy Protocol or Socks5 support For details see chapter &<<SECTproxyInbound>>&. -.wen .vitem &$prdr_requested$& .cindex "PRDR" "variable for" @@ -12302,13 +12289,11 @@ The value set for the &%qualify_domain%& option in the configuration file. The value set for the &%qualify_recipient%& option in the configuration file, or if not set, the value of &$qualify_domain$&. -.new .vitem &$queue_name$& .vindex &$queue_name$& .cindex "named queues" .cindex queues named The name of the spool queue in use; empty for the default queue. -.wen .vitem &$rcpt_count$& .vindex "&$rcpt_count$&" @@ -13109,7 +13094,6 @@ overriding the setting of &%perl_at_start%&. There is also a command line option &%-pd%& (for delay) which suppresses the initial startup, even if &%perl_at_start%& is set. -.new .ilist .oindex "&%perl_taintmode%&" .cindex "Perl" "taintmode" @@ -13118,7 +13102,6 @@ interpeter, the &%perl_taintmode%& option can be set. This enables the taint mode of the Perl interpreter. You are encouraged to set this option to a true value. To avoid breaking existing installations, it defaults to false. -.wen .section "Calling Perl subroutines" "SECID86" @@ -14351,15 +14334,11 @@ $primary_hostname-$tod_epoch-testing See section &<<CALLaddparcall>>& for details of how this value is used. -.new .option check_log_inodes main integer 100 -.wen See &%check_spool_space%& below. -.new .option check_log_space main integer 10M -.wen See &%check_spool_space%& below. .oindex "&%check_rfc2047_length%&" @@ -14374,15 +14353,11 @@ of the RFC, generates overlong encoded words. If &%check_rfc2047_length%& is set false, Exim recognizes encoded words of any length. -.new .option check_spool_inodes main integer 100 -.wen See &%check_spool_space%& below. -.new .option check_spool_space main integer 10M -.wen .cindex "checking disk space" .cindex "disk space, checking" .cindex "spool directory" "checking space" @@ -14428,21 +14403,17 @@ For non-SMTP input and for batched SMTP input, the test is done at start-up; on failure a message is written to stderr and Exim exits with a non-zero code, as it obviously cannot send an error message of any kind. -.new There is a slight performance penalty for these checks. Versions of Exim preceding 4.88 had these disabled by default; high-rate intallations confident they will never run out of resources may wish to deliberately disable them. -.wen -.new .option chunking_advertise_hosts main "host list&!!" * .cindex CHUNKING advertisement .cindex "RFC 3030" "CHUNKING" The CHUNKING extension (RFC3030) will be advertised in the EHLO message to these hosts. Hosts may use the BDAT command as an alternate to DATA. -.wen .option daemon_smtp_ports main string &`smtp`& .cindex "port" "for daemon" @@ -16062,12 +16033,10 @@ the limit, allowing any number of simultaneous queue runner processes to be run. If you do not want queue runs to occur, omit the &%-q%&&'xx'& setting on the daemon's command line. -.new .cindex queues named .cindex "named queues" To set limits for different named queues use an expansion depending on the &$queue_name$& variable. -.wen .option queue_smtp_domains main "domain list&!!" unset .cindex "queueing incoming messages" @@ -17030,10 +16999,8 @@ if the OpenSSL build supports TLS extensions and the TLS client sends the Server Name Indication extension, then this option and others documented in &<<SECTtlssni>>& will be re-expanded. -.new If this option is unset or empty a fresh self-signed certificate will be generated for every connection. -.wen .option tls_crl main string&!! unset .cindex "TLS" "server certificate revocation list" @@ -17070,12 +17037,10 @@ larger prime than requested. The value of this option is expanded and indicates the source of DH parameters to be used by Exim. -.new &*Note: The Exim Maintainers strongly recommend using a filename with site-generated local DH parameters*&, which has been supported across all versions of Exim. The other specific constants available are a fallback so that even when "unconfigured", Exim can offer Perfect Forward Secrecy in older ciphersuites in TLS. -.wen If &%tls_dhparam%& is a filename starting with a &`/`&, then it names a file from which DH @@ -17094,7 +17059,6 @@ Exim will attempt to load a file from inside the spool directory. If the file does not exist, Exim will attempt to create it. See section &<<SECTgnutlsparam>>& for further details. -.new If Exim is using OpenSSL and this option is empty or unset, then Exim will load a default DH prime; the default is Exim-specific but lacks verifiable provenance. @@ -17126,7 +17090,6 @@ of the later IKE values, which led into RFC7919 providing new fixed constants At this point, all of the "ike" values should be considered obsolete; they're still in Exim to avoid breaking unusual configurations, but are candidates for removal the next time we have backwards-incompatible changes. -.wen The TLS protocol does not negotiate an acceptable size for this; clients tend to hard-drop connections if what is offered by the server is unacceptable, @@ -17144,17 +17107,19 @@ prior to the 4.80 release, as Debian used to patch Exim to raise the minimum acceptable bound from 1024 to 2048. -.option tls_eccurve main string&!! prime256v1 +.option tls_eccurve main string&!! &`auto`& .cindex TLS "EC cryptography" -If built with a recent-enough version of OpenSSL, -this option selects a EC curve for use by Exim. +This option selects a EC curve for use by Exim. + +After expansion it must contain a valid EC curve parameter, such as +&`prime256v1`&, &`secp384r1`&, or &`P-512`&. Consult your OpenSSL manual +for valid selections. -Curve names of the form &'prime256v1'& are accepted. -For even more-recent library versions, names of the form &'P-512'& -are also accepted, plus the special value &'auto'& -which tells the library to choose. +For OpenSSL versions before (and not including) 1.0.2, the string +&`auto`& selects &`prime256v1`&. For more recent OpenSSL versions +&`auto`& tells the library to choose. -If the option is set to an empty string, no EC curves will be enabled. +If the option expands to an empty string, no EC curves will be enabled. .option tls_ocsp_file main string&!! unset @@ -23996,7 +23961,6 @@ connects. If authentication fails, Exim will try to transfer the message unauthenticated. See also &%hosts_require_auth%&, and chapter &<<CHAPSMTPAUTH>>& for details of authentication. -.new .option hosts_try_chunking smtp "host list&!!" * .cindex CHUNKING "enabling, in client" .cindex BDAT "SMTP command" @@ -24004,9 +23968,7 @@ unauthenticated. See also &%hosts_require_auth%&, and chapter This option provides a list of servers to which, provided they announce CHUNKING support, Exim will attempt to use BDAT commands rather than DATA. BDAT will not be used in conjuction with a transport filter. -.wen -.new .option hosts_try_fastopen smtp "host list!!" unset .option "fast open, TCP" "enabling, in client" .option "TCP Fast Open" "enabling, in client" @@ -24023,7 +23985,6 @@ as the initiator must present a cookie in the SYN segment. On (at least some) current Linux distributions the facility must be enabled in the kernel by the sysadmin before the support is usable. -.wen .option hosts_try_prdr smtp "host list&!!" * .cindex "PRDR" "enabling, optional in client" @@ -26809,7 +26770,7 @@ tls: .endd This accepts a client certificate that is verifiable against any of your configured trust-anchors -which usually means the full set of public CAs) +(which usually means the full set of public CAs) and which has a SAN with a good account name. Note that the client cert is on the wire in-clear, including the SAN, whereas a plaintext SMTP AUTH done inside TLS is not. @@ -27189,12 +27150,10 @@ rejected with a 554 error code. To enable TLS operations on a server, the &%tls_advertise_hosts%& option must be set to match some hosts. The default is * which matches all hosts. -.new If this is all you do, TLS encryption will be enabled but not authentication - meaning that the peer has no assurance it is actually you he is talking to. You gain protection from a passive sniffer listening on the wire but not from someone able to intercept the communication. -.wen Further protection requires some further configuration at the server end. @@ -27573,11 +27532,9 @@ Great care should be taken to deal with matters of case, various injection attacks in the string (&`../`& or SQL), and ensuring that a valid filename can always be referenced; it is important to remember that &$tls_in_sni$& is arbitrary unverified data provided prior to authentication. -.new Further, the initial cerificate is loaded before SNI is arrived, so an expansion for &%tls_certificate%& must have a default which is used when &$tls_in_sni$& is empty. -.wen The Exim developers are proceeding cautiously and so far no other TLS options are re-expanded. @@ -27900,7 +27857,6 @@ received, before the final response to the DATA command is sent. This is the ACL specified by &%acl_smtp_data%&, which is the second ACL that is associated with the DATA command. -.new .cindex CHUNKING "BDAT command" .cindex BDAT "SMTP command" .cindex "RFC 3030" CHUNKING @@ -27909,7 +27865,6 @@ the &%acl_smtp_predata%& ACL is not run. . XXX why not? It should be possible, for the first BDAT. The &%acl_smtp_data%& is run after the last BDAT command and all of the data specified is received. -.wen For both of these ACLs, it is not possible to reject individual recipients. An error response rejects the entire message. Unfortunately, it is known that some @@ -28807,7 +28762,6 @@ all the conditions are true, wherever it appears in an ACL command, whereas effect. -.new .vitem &*queue*&&~=&~<&'text'&> This modifier specifies the use of a named queue for spool files for the message. @@ -28817,7 +28771,6 @@ This could be used, for example, for known high-volume burst sources of traffic, or for quarantine of messages. Separate queue-runner processes will be needed for named queues. If the text after expansion is empty, the default queue is used. -.wen .vitem &*remove_header*&&~=&~<&'text'&> @@ -28950,7 +28903,6 @@ If the item is successfully delivered in cutthrough mode the delivery log lines are tagged with ">>" rather than "=>" and appear before the acceptance "<=" line. -.new If there is a temporary error the item is queued for later delivery in the usual fashion. This behaviour can be adjusted by appending the option &*defer=*&<&'value'&> @@ -28958,7 +28910,6 @@ to the control; the default value is &"spool"& and the alternate value &"pass"& copies an SMTP defer response from the target back to the initiator and does not queue the message. Note that this is independent of any receipient verify conditions in the ACL. -.wen Delivery in this mode avoids the generation of a bounce mail to a (possibly faked) @@ -28974,9 +28925,7 @@ with &`-d`&, with the output going to a new logfile, by default called may access any variables already defined. The logging may be adjusted with the &'opts'& option, which takes the same values as the &`-d`& command-line option. -.new Logging may be stopped, and the file removed, with the &'kill'& option. -.wen Some examples (which depend on variables that don't exist in all contexts): .code @@ -31673,6 +31622,15 @@ configuration as follows (example): .code spamd_address = 192.168.99.45 387 .endd +The SpamAssassin protocol relies on a TCP half-close from the client. +If your SpamAssassin client side is running a Linux system with an +iptables firewall, consider setting +&%net.netfilter.nf_conntrack_tcp_timeout_close_wait%& to at least the +timeout, Exim uses when waiting for a response from the SpamAssassin +server (currently defaulting to 120s). With a lower value the Linux +connection tracking may consider your half-closed connection as dead too +soon. + To use Rspamd (which by default listens on all local addresses on TCP port 11333) @@ -31830,11 +31788,9 @@ spam bar is 50 characters. A multiline text table, containing the full SpamAssassin report for the message. Useful for inclusion in headers or reject messages. This variable is only usable in a DATA-time ACL. -.new Beware that SpamAssassin may return non-ASCII characters, especially when running in country-specific locales, which are not legal unencoded in headers. -.wen .vitem &$spam_action$& For SpamAssassin either 'reject' or 'no action' depending on the @@ -38261,6 +38217,7 @@ These options take (expandable) strings as arguments. MANDATORY: The domain you want to sign with. The result of this expanded option is put into the &%$dkim_domain%& expansion variable. +If it is empty after expansion, DKIM signing is not done. .option dkim_selector smtp string&!! unset MANDATORY: @@ -38425,11 +38382,9 @@ The header canonicalization method. One of 'relaxed' or 'simple'. .vitem &%$dkim_copiedheaders%& A transcript of headers and their values which are included in the signature (copied from the 'z=' tag of the signature). -.new Note that RFC6376 requires that verification fail if the From: header is not included in the signature. Exim does not enforce this; sites wishing strict enforcement should code the check explicitly. -.wen .vitem &%$dkim_bodylength%& The number of signed body bytes. If zero ("0"), the body is unsigned. If no @@ -38487,10 +38442,8 @@ warn log_message = GMail sender without gmail.com DKIM signature dkim_status = none .endd -.new Note that the above does not check for a total lack of DKIM signing; for that check for empty &$h_DKIM-Signature:$& in the data ACL. -.wen .vitem &%dkim_status%& ACL condition that checks a colon-separated list of possible DKIM verification @@ -38550,7 +38503,6 @@ Use of a proxy is enabled by setting the &%hosts_proxy%& main configuration option to a hostlist; connections from these hosts will use Proxy Protocol. -.new The following expansion variables are usable (&"internal"& and &"external"& here refer to the interfaces of the proxy): @@ -38563,7 +38515,6 @@ of the proxy): .endd If &$proxy_session$& is set but &$proxy_external_address$& is empty there was a protocol error. -.wen Since the real connections are all coming from the proxy, and the per host connection tracking is done before Proxy Protocol is @@ -38784,7 +38735,7 @@ must be representable in UTF-16. .cindex events The events mechanism in Exim can be used to intercept processing at a number -of points. It was originally invented to giave a way to do customised logging +of points. It was originally invented to give a way to do customised logging actions (for example, to a database) but can also be used to modify some processing actions. @@ -38854,7 +38805,7 @@ with the event type: The :defer events populate one extra variable: &$event_defer_errno$&. For complex operations an ACL expansion can be used in &%event_action%& -however due to the multiple contextx that Exim operates in during +however due to the multiple contexts that Exim operates in during the course of its processing: .ilist variables set in transport events will not be visible outside that diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 0127dd65a..5427392b9 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,12 +1,15 @@ Change log file for Exim from version 4.21 ------------------------------------------- +This document describes *changes* to previous versions, that might +affect Exim's operation, with an unchanged configuration file. For new +options, and new features, see the NewStuff file next to this ChangeLog. -Exim version 4.next +Exim version 4.89 ------------------- JH/01 Bug 1922: Support IDNA2008. This has slightly different conversion rules than -2003 did; needs libidn2 in addition to linidn. -JH/02 The path option on a pipe transport is now expanded before use +JH/02 The path option on a pipe transport is now expanded before use. Exim version 4.88 @@ -139,6 +142,18 @@ JH/32 Bug 1909: Fix OCSP proof verification for cases where the proof is JH/33 Bug 1914: Ensure socket is nonblocking before draining after SMTP QUIT. +HS/01 Fix leak in verify callout under GnuTLS, about 3MB per recipient on + an incoming connection. + +HS/02 Bug 1802: Do not half-close the connection after sending a request + to rspamd. + +HS/03 Use "auto" as the default EC curve parameter. For OpenSSL < 1.0.2 + fallback to "prime256v1". + +JH/34 SECURITY: Use proper copy of DATA command in error message. + Could leak key material. Remotely explaoitable. CVE-2016-9963. + Exim version 4.87 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index ac1968627..9281b3666 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -6,6 +6,10 @@ Before a formal release, there may be quite a lot of detail so that people can test from the snapshots or the CVS before the documentation is updated. Once the documentation is updated, this file is reduced to a short list. +Version 4.89 +------------ + + Version 4.88 ------------ @@ -39,7 +43,7 @@ Version 4.88 10. Feature macros, generated from compile options. All start with "_HAVE_" and go on with some roughly recognisable name. Driver macros, for - router, transport and authentication drivers; names starting with "_DRVR_". + router, transport and authentication drivers; names starting with "_DRIVER_". Option macros, for each configuration-file option; all start with "_OPT_". Use the "-bP macros" command-line option to see what is present. @@ -63,6 +67,8 @@ Version 4.88 previous communication with the peer (we save a cookie from it) this will only become active on frequently-contacted destinations. +16. A new syslog_pid option to suppress PID duplication in syslog lines. + Version 4.87 ------------ diff --git a/doc/doc-txt/cve-2016-9663 b/doc/doc-txt/cve-2016-9663 new file mode 100644 index 000000000..ffff3db52 --- /dev/null +++ b/doc/doc-txt/cve-2016-9663 @@ -0,0 +1,95 @@ +CVE ID: CVE-2016-9963 +Date: 2016-12-15 +Credits: Bjoern Jacke <bjoern@j3e.de> +Version(s): 4.69 -> 4.87 +Issue: If several conditions are met, Exim leaks private information + to a remote attacker. + +Conditions +========== + +If *all* of the following conditions are met + + Build options + ------------- + + * Exim is built with DKIM enabled (default for newer versions) + exim -bV | grep 'Support.*DKIM' + + Runtime options + --------------- + + * Exim uses DKIM signing (transport options dkim_private_key, + dkim_domain, and other) + + * The dkim_private_key option names a file containing the key. + + exim -bP transports | grep 'dkim_private_key = .' + + * Exim uses PRDR (transport option hosts_try_prdr) (default + since 4.86) + + exim -bP transports | grep 'hosts_try_prdr = .' + + *OR* + + Exim uses the LMTP protocol variant for SMTP transport. + + exim -bP transports | grep 'protocol = lmtp' + + Operation + --------- + + * Exim transports a multi-recipient message + + * The destination host supports PRDR + OR + the message transport uses LMTP + + * One or more recipients are rejected after the DATA phase + +Impact +====== + +Exim leaks the private DKIM signing key to the log files. Additionally, +if the build option EXPERIMENTAL_DSN_INFO=yes is used, the key material +is included in the bounce message. + +Fix +=== + +Install a fixed Exim version: + + 4.88 + 4.87.1 + +If you can't install one of the above versions, ask your package +maintainer for a version containing the backported fix. On request and +depending on our resources we will support you in backporting the fix. +(Please note, that Exim project officially doesn't support versions +prior the current stable version.) + +If you think that you MIGHT be affected, we HIGHLY recommend to create +a new set of DKIM keys and fade out the previous DKIM key soon to make +sure that a possibly leaked DKIM key can not be misused in the future. + + +Workaround +========== + +Disable PRDR in your outgoing transport(s): set hosts_try_prdr to an +empty string. + +AND do not use the LMTP protocol variant of the SMTP driver. + +Indication +========== + +You can check if you where affected already. The mainlog entries look like this: + +2016-12-17 09:44:33 10HmaX-0005vi-00 ** baduser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: PRDR error after -----BEGIN RSA PRIVATE KEY-----\nMIICXQIBAAKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd\n+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+Y\ndhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB\nAoGAZPokJKQQmRK6a0zn5f8lWemy0airG66KhzDF0Pafb/nWKgDCB02gpJgdw5rJ\nbO7/HI3IeqsfRdYTP7tjfmZtPiPo1mnF7D1rSRspZjOF2yXY/ky7t7c5xChRcSxf\n+69CknwjrfteY9Aj0j6o7N+2w2uvHO+AAq8BHDgXKmPo0SECQQDzQ/glyhNH9tlO\nx+3TTMwwyZUf2mYYosN3Q9NIl3Umz/3+13K5b6Ed6fZvS/XwU55Qf5IBUVj2Fujk\nRv2lbGPpAkEA4okpnzYz5nm1X5WjpJPQPyo8nGEU1A5QfoDbkAvWYvVoYrpWPOx5\nHFpOAHkvSk1Y1vhCUa+zHwiQRBC8OMp6LwJBAOAUK/AjQ792UpWO9DM++pe2F/dP\nZdwrkYG6qFSlrvQhgwXLz5GgkfjMGoRKpDDL1XixCfzMwfVtBPnBqsNGJIECQGYX\nSIGu7L7edMXJ60C9OKluwHf9LGTQuqf4LHsDSq+4Rz3PGhREwePsMqD1/EDxEKt4\noHKtyvyeYF28aQbzARMCQQCRtJlR6vlKhxYL8+xoPrCu3MijKgVruRUcNstXkDZK\nfKQax6vhiMq+0qIiEwLA1wavyLVKZ7Mfag+/4NTcDUVC\n-----END RSA PRIVATE KEY-----\n: 550 PRDR R=<baduser@test.ex> refusal + +Even if there is no evidence in the existing log files, that a DKIM key +leakage happened this might have happened in the past, log files might +have been deleted already but a key leak could have ended up via mail +bounce in a user mail box diff --git a/src/src/dkim.c b/src/src/dkim.c index 3fa11c800..70c9547ec 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -612,6 +612,7 @@ while ((dkim_signing_domain = string_nextinlist(&dkim_domain, &sep, CS dkim_private_key_expanded, PDKIM_ALGO_RSA_SHA256, dkim->dot_stuffed); + dkim_private_key_expanded[0] = '\0'; pdkim_set_optional(ctx, CS dkim_sign_headers_expanded, NULL, diff --git a/src/src/exim.h b/src/src/exim.h index 9ae96b2a0..d03b48c66 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -551,10 +551,16 @@ union sockaddr_46 { }; /* If SUPPORT_TLS is not defined, ensure that USE_GNUTLS is also not defined -so that if USE_GNUTLS *is* set, we can assume SUPPORT_TLS is also set. */ +so that if USE_GNUTLS *is* set, we can assume SUPPORT_TLS is also set. +Likewise, OSCP, AUTH_TLS and CERTNAMES cannot be supported. */ #ifndef SUPPORT_TLS # undef USE_GNUTLS +# ifndef DISABLE_OCSP +# define DISABLE_OCSP +# endif +# undef EXPERIMENTAL_CERTNAMES +# undef AUTH_TLS #endif /* If SPOOL_DIRECTORY, LOG_FILE_PATH or PID_FILE_PATH have not been defined, diff --git a/src/src/functions.h b/src/src/functions.h index cc4e22b2e..04d941034 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -317,7 +317,7 @@ extern void readconf_driver_init(uschar *, driver_instance **, driver_info *, int, void *, int, optionlist *, int); extern uschar *readconf_find_option(void *); extern void readconf_main(BOOL); -extern void readconf_options_from_list(optionlist *, unsigned, uschar *); +extern void readconf_options_from_list(optionlist *, unsigned, const uschar *, uschar *); extern void readconf_options_routers(void); extern void readconf_options_transports(void); extern void readconf_print(uschar *, uschar *, BOOL); diff --git a/src/src/globals.c b/src/src/globals.c index 23bd6900c..55d9e98ae 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -153,7 +153,7 @@ that's the interop problem which has been observed: GnuTLS suggesting a higher bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */ int tls_dh_max_bits = 2236; uschar *tls_dhparam = NULL; -uschar *tls_eccurve = US"prime256v1"; +uschar *tls_eccurve = US"auto"; # ifndef DISABLE_OCSP uschar *tls_ocsp_file = NULL; # endif diff --git a/src/src/readconf.c b/src/src/readconf.c index 21328bd3a..c5bd41d47 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -796,76 +796,76 @@ due to conflicts with other common macros. */ #endif #ifdef LOOKUP_LSEARCH - macro_create(US"_HAVE_LKUP_LSEARCH", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_LSEARCH", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_CDB - macro_create(US"_HAVE_LKUP_CDB", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_CDB", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_DBM - macro_create(US"_HAVE_LKUP_DBM", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_DBM", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_DNSDB - macro_create(US"_HAVE_LKUP_DNSDB", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_DNSDB", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_DSEARCH - macro_create(US"_HAVE_LKUP_DSEARCH", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_DSEARCH", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_IBASE - macro_create(US"_HAVE_LKUP_IBASE", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_IBASE", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_LDAP - macro_create(US"_HAVE_LKUP_LDAP", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_LDAP", US"y", FALSE, TRUE); #endif #ifdef EXPERIMENTAL_LMDB - macro_create(US"_HAVE_LKUP_LMDB", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_LMDB", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_MYSQL - macro_create(US"_HAVE_LKUP_MYSQL", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_MYSQL", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_NIS - macro_create(US"_HAVE_LKUP_NIS", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_NIS", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_NISPLUS - macro_create(US"_HAVE_LKUP_NISPLUS", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_NISPLUS", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_ORACLE - macro_create(US"_HAVE_LKUP_ORACLE", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_ORACLE", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_PASSWD - macro_create(US"_HAVE_LKUP_PASSWD", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_PASSWD", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_PGSQL - macro_create(US"_HAVE_LKUP_PGSQL", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_PGSQL", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_REDIS - macro_create(US"_HAVE_LKUP_REDIS", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_REDIS", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_SQLITE - macro_create(US"_HAVE_LKUP_SQLITE", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_SQLITE", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_TESTDB - macro_create(US"_HAVE_LKUP_TESTDB", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_TESTDB", US"y", FALSE, TRUE); #endif #ifdef LOOKUP_WHOSON - macro_create(US"_HAVE_LKUP_WHOSON", US"y", FALSE, TRUE); + macro_create(US"_HAVE_LOOKUP_WHOSON", US"y", FALSE, TRUE); #endif #ifdef TRANSPORT_APPENDFILE # ifdef SUPPORT_MAILDIR - macro_create(US"_HAVE_TPT_APPEND_MAILDR", US"y", FALSE, TRUE); + macro_create(US"_HAVE_TRANSPORT_APPEND_MAILDR", US"y", FALSE, TRUE); # endif # ifdef SUPPORT_MAILSTORE - macro_create(US"_HAVE_TPT_APPEND_MAILSTORE", US"y", FALSE, TRUE); + macro_create(US"_HAVE_TRANSPORT_APPEND_MAILSTORE", US"y", FALSE, TRUE); # endif # ifdef SUPPORT_MBX - macro_create(US"_HAVE_TPT_APPEND_MBX", US"y", FALSE, TRUE); + macro_create(US"_HAVE_TRANSPORT_APPEND_MBX", US"y", FALSE, TRUE); # endif #endif } void -readconf_options_from_list(optionlist * opts, unsigned nopt, uschar * group) +readconf_options_from_list(optionlist * opts, unsigned nopt, const uschar * section, uschar * group) { int i; const uschar * s; @@ -878,14 +878,17 @@ macros that have substrings are always discovered first during expansion. */ for (i = 0; i < nopt; i++) if (*(s = opts[i].name) && *s != '*') - macro_create(string_sprintf("_OPT_%T_%T", group, s), US"y", FALSE, TRUE); + if (group) + macro_create(string_sprintf("_OPT_%T_%T_%T", section, group, s), US"y", FALSE, TRUE); + else + macro_create(string_sprintf("_OPT_%T_%T", section, s), US"y", FALSE, TRUE); } static void readconf_options(void) { -readconf_options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN"); +readconf_options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN", NULL); readconf_options_routers(); readconf_options_transports(); readconf_options_auths(); @@ -4349,12 +4352,12 @@ readconf_options_auths(void) { struct auth_info * ai; -readconf_options_from_list(optionlist_auths, optionlist_auths_size, US"AU"); +readconf_options_from_list(optionlist_auths, optionlist_auths_size, US"AUTHENTICATORS", NULL); for (ai = auths_available; ai->driver_name[0]; ai++) { - macro_create(string_sprintf("_DRVR_AUTH_%T", ai->driver_name), US"y", FALSE, TRUE); - readconf_options_from_list(ai->options, (unsigned)*ai->options_count, ai->driver_name); + macro_create(string_sprintf("_DRIVER_AUTHENTICATOR_%T", ai->driver_name), US"y", FALSE, TRUE); + readconf_options_from_list(ai->options, (unsigned)*ai->options_count, US"AUTHENTICATOR", ai->driver_name); } } diff --git a/src/src/route.c b/src/src/route.c index 3ca1afbfb..bb220c69b 100644 --- a/src/src/route.c +++ b/src/src/route.c @@ -148,12 +148,12 @@ readconf_options_routers(void) { struct router_info * ri; -readconf_options_from_list(optionlist_routers, nelem(optionlist_routers), US"RT"); +readconf_options_from_list(optionlist_routers, nelem(optionlist_routers), US"ROUTERS", NULL); for (ri = routers_available; ri->driver_name[0]; ri++) { - macro_create(string_sprintf("_DRVR_RTR_%T", ri->driver_name), US"y", FALSE, TRUE); - readconf_options_from_list(ri->options, (unsigned)*ri->options_count, ri->driver_name); + macro_create(string_sprintf("_DRIVER_ROUTER_%T", ri->driver_name), US"y", FALSE, TRUE); + readconf_options_from_list(ri->options, (unsigned)*ri->options_count, US"ROUTER", ri->driver_name); } } diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index d7080168a..148486161 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -3512,7 +3512,7 @@ while (done <= 0) uschar *orcpt = NULL; int flags; -#if defined(SUPPORT_TLS) && defined(AUTH_TLS) +#ifdef AUTH_TLS /* Check once per STARTTLS or SSL-on-connect for a TLS AUTH */ if ( tls_in.active >= 0 && tls_in.peercert @@ -3928,7 +3928,7 @@ while (done <= 0) them in either case in the AUTH command. */ if ( auths -#if defined(SUPPORT_TLS) && defined(AUTH_TLS) +#ifdef AUTH_TLS && !sender_host_authenticated #endif && verify_check_host(&auth_advertise_hosts) == OK diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index 3762c7889..2862111ab 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -83,9 +83,6 @@ functions from the OpenSSL library. */ # define EXIM_HAVE_ECDH # endif # if OPENSSL_VERSION_NUMBER >= 0x10002000L -# if OPENSSL_VERSION_NUMBER < 0x10100000L -# define EXIM_HAVE_OPENSSL_ECDH_AUTO -# endif # define EXIM_HAVE_OPENSSL_EC_NIST2NID # endif # endif @@ -729,16 +726,32 @@ if (!expand_check(tls_eccurve, US"tls_eccurve", &exp_curve)) if (!exp_curve || !*exp_curve) return TRUE; -# ifdef EXIM_HAVE_OPENSSL_ECDH_AUTO -/* check if new enough library to support auto ECDH temp key parameter selection */ +/* "auto" needs to be handled carefully. + * OpenSSL < 1.0.2: we do not select anything, but fallback to primve256v1 + * OpenSSL < 1.1.0: we have to call SSL_CTX_set_ecdh_auto + * (openss/ssl.h defines SSL_CTRL_SET_ECDH_AUTO) + * OpenSSL >= 1.1.0: we do not set anything, the libray does autoselection + * https://github.com/openssl/openssl/commit/fe6ef2472db933f01b59cad82aa925736935984b + */ if (Ustrcmp(exp_curve, "auto") == 0) { +#if OPENSSL_VERSION_NUMBER < 0x10002000L DEBUG(D_tls) debug_printf( - "ECDH temp key parameter settings: OpenSSL 1.2+ autoselection\n"); + "ECDH OpenSSL < 1.0.2: temp key parameter settings: overriding \"auto\" with \"prime256v1\"\n"); + exp_curve = "prime256v1"; +#else +# if defined SSL_CTRL_SET_ECDH_AUTO + DEBUG(D_tls) debug_printf( + "ECDH OpenSSL 1.0.2+ temp key parameter settings: autoselection\n"); SSL_CTX_set_ecdh_auto(sctx, 1); return TRUE; +# else + DEBUG(D_tls) debug_printf( + "ECDH OpenSSL 1.1.0+ temp key parameter settings: default selection\n"); + return TRUE; +# endif +#endif } -# endif DEBUG(D_tls) debug_printf("ECDH: curve '%s'\n", exp_curve); if ( (nid = OBJ_sn2nid (CCS exp_curve)) == NID_undef diff --git a/src/src/transport.c b/src/src/transport.c index 8381913fc..c48f1575b 100644 --- a/src/src/transport.c +++ b/src/src/transport.c @@ -116,14 +116,14 @@ readconf_options_transports(void) { struct transport_info * ti; -readconf_options_from_list(optionlist_transports, nelem(optionlist_transports), US"TP"); +readconf_options_from_list(optionlist_transports, nelem(optionlist_transports), US"TRANSPORTS", NULL); for (ti = transports_available; ti->driver_name[0]; ti++) { - macro_create(string_sprintf("_DRVR_TPT_%T", ti->driver_name), US"y", FALSE, TRUE); - readconf_options_from_list(ti->options, (unsigned)*ti->options_count, ti->driver_name); + macro_create(string_sprintf("_DRIVER_TRANSPORT_%T", ti->driver_name), US"y", FALSE, TRUE); + readconf_options_from_list(ti->options, (unsigned)*ti->options_count, US"TRANSPORT", ti->driver_name); } -} +} /************************************************* * Initialize transport list * diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index d04dfc200..527142967 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -285,10 +285,11 @@ static uschar *rf_names[] = { US"NEVER", US"SUCCESS", US"FAILURE", US"DELAY" }; /* Local statics */ -static uschar *smtp_command; /* Points to last cmd for error messages */ -static uschar *mail_command; /* Points to MAIL cmd for error messages */ -static BOOL update_waiting; /* TRUE to update the "wait" database */ -static BOOL pipelining_active; /* current transaction is in pipe mode */ +static uschar *smtp_command; /* Points to last cmd for error messages */ +static uschar *mail_command; /* Points to MAIL cmd for error messages */ +static uschar *data_command = US""; /* Points to DATA cmd for error messages */ +static BOOL update_waiting; /* TRUE to update the "wait" database */ +static BOOL pipelining_active; /* current transaction is in pipe mode */ /************************************************* @@ -1390,10 +1391,14 @@ uschar * buffer = tctx->buffer; /* Write SMTP chunk header command */ if (chunk_size > 0) + { if((cmd_count = smtp_write_command(tctx->outblock, FALSE, "BDAT %u%s\r\n", chunk_size, flags & tc_chunk_last ? " LAST" : "") ) < 0) return ERROR; + if (flags & tc_chunk_last) + data_command = string_copy(big_buffer); /* Save for later error message */ + } prev_cmd_count = cmd_count += tctx->cmd_count; @@ -2509,6 +2514,7 @@ if ( !(peer_offered & PEER_OFFERED_CHUNKING) default: goto RESPONSE_FAILED; /* I/O error, or any MAIL/DATA error */ } pipelining_active = FALSE; + data_command = string_copy(big_buffer); /* Save for later error message */ } /* If there were no good recipients (but otherwise there have been no @@ -2732,7 +2738,7 @@ else #else "LMTP error after %s: %s", #endif - big_buffer, string_printing(buffer)); + data_command, string_printing(buffer)); setflag(addr, af_pass_message); /* Allow message to go to user */ if (buffer[0] == '5') addr->transport_return = FAIL; diff --git a/test/confs/0570 b/test/confs/0570 index 1c2ca0a25..962e76bb0 100644 --- a/test/confs/0570 +++ b/test/confs/0570 @@ -36,5 +36,6 @@ smtp: driver = smtp port = PORT_D OPTION + max_parallel = 1 # End diff --git a/test/confs/4510 b/test/confs/4510 new file mode 100644 index 000000000..42c58aac5 --- /dev/null +++ b/test/confs/4510 @@ -0,0 +1,57 @@ +# Exim test configuration 4510 + +SERVER= +OPT= + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames +acl_smtp_data_prdr = accept local_parts = okuser + +prdr_enable + +# ----- Routers + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + transport = send_to_server + +server_dump: + driver = redirect + senders = ! : + data = :blackhole: + +server_store: + driver = accept + transport = store + +# ----- Transports + +begin transports + +store: + driver = appendfile + file = DIR/test-mail/store + return_path_add + user = CALLER + +send_to_server: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + + dkim_domain = ${if def:sender_address_local_part {test.ex}} + dkim_selector = sel + dkim_private_key = DIR/aux-fixed/dkim/dkim.private + dkim_sign_headers = From + +# End diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm index 8d22544bf..537cea1e9 100644 --- a/test/lib/Exim/Runtest.pm +++ b/test/lib/Exim/Runtest.pm @@ -103,6 +103,7 @@ sub exim_binary { my $os = `$_/scripts/os-type`; my $arch = `$_/scripts/arch-type`; chomp($os, $arch); + ($ENV{build} ? "$_/build-$ENV{build}" : ()), "$_/build-$os-$arch" . ($ENV{EXIM_BUILD_SUFFIX} ? ".$ENV{EXIM_BUILD_SUFFIX}" : ''); } @candidates; diff --git a/test/log/0570 b/test/log/0570 index fa76b71f1..3630b692a 100644 --- a/test/log/0570 +++ b/test/log/0570 @@ -1,43 +1,58 @@ -**NOTE: The delivery lines in this file have been sorted. 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domd.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbB-0005vi-00 == usery@domf.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@dome.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domf.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00" +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" -1999-03-02 09:44:33 10HmbE-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-0005vi-00" +1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@domg.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" +1999-03-02 09:44:33 10HmbE-0005vi-00 -> usery@domh.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbH-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00" -1999-03-02 09:44:33 10HmbH-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-0005vi-00" -1999-03-02 09:44:33 10HmbH-0005vi-00 Completed +1999-03-02 09:44:33 10HmbG-0005vi-00 == usery@doml.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbG-0005vi-00 => userx@domk.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbG-0005vi-00 => usery@doml.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00" +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbK-0005vi-00 -> usery@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 => userz@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbM-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 Completed +1999-03-02 09:44:33 10HmbJ-0005vi-00 == usery@domn.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@domm.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbJ-0005vi-00 => usery@domn.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" +1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbM-0005vi-00 == userz@domq.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbM-0005vi-00 => userx@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" +1999-03-02 09:44:33 10HmbM-0005vi-00 -> usery@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" +1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbM-0005vi-00 => userz@domq.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbO-0005vi-00" +1999-03-02 09:44:33 10HmbM-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 @@ -46,41 +61,46 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domC.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domD.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domE.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domF.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domG.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domH.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex -1999-03-02 09:44:33 10HmbG-0005vi-00 => blackhole (RCPT ACL discarded recipients) -1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domK.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbG-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbH-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domL.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbG-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex -1999-03-02 09:44:33 10HmbJ-0005vi-00 => blackhole (RCPT ACL discarded recipients) -1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domM.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbJ-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbK-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbK-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domN.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbJ-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domC.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex -1999-03-02 09:44:33 10HmbM-0005vi-00 => blackhole (RCPT ACL discarded recipients) -1999-03-02 09:44:33 10HmbM-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domP.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domP.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbM-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbN-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbN-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domQ.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbM-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbO-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbO-0005vi-00 Completed diff --git a/test/log/4510 b/test/log/4510 new file mode 100644 index 000000000..0d826ab32 --- /dev/null +++ b/test/log/4510 @@ -0,0 +1,20 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 ** baduser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: PRDR error after DATA: 550 PRDR R=<baduser@test.ex> refusal +1999-03-02 09:44:33 10HmaX-0005vi-00 => okuser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] PRDR C="250 PRDR R=<okuser@test.ex> acceptance" +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbA-0005vi-00 signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R=<baduser@test.ex> refusal +1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R=<okuser@test.ex> acceptance +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp PRDR S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <okuser@test.ex> R=server_dump +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=server_store T=store +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed diff --git a/test/mail/4510.store b/test/mail/4510.store new file mode 100644 index 000000000..d75e40906 --- /dev/null +++ b/test/mail/4510.store @@ -0,0 +1,58 @@ +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Return-path: <> +Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) + by myhost.test.ex with esmtp (Exim x.yz) + id 10HmaZ-0005vi-00 + for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) + id 10HmaY-0005vi-00 + for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +X-Failed-Recipients: baduser@test.ex +Auto-Submitted: auto-replied +From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> +To: CALLER@myhost.test.ex +Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM +MIME-Version: 1.0 +Subject: Mail delivery failed: returning message to sender +Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: text/plain; charset=us-ascii + +This message was created automatically by mail delivery software. + +A message that you sent could not be delivered to one or more of its +recipients. This is a permanent error. The following address(es) failed: + + baduser@test.ex + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] + PRDR error after DATA: 550 PRDR R=<baduser@test.ex> refusal + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/delivery-status + +Reporting-MTA: dns; myhost.test.ex + +Action: failed +Final-Recipient: rfc822;baduser@test.ex +Status: 5.0.0 +Diagnostic-Code: smtp; 550 PRDR R=<baduser@test.ex> refusal + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/rfc822 + +Return-path: <CALLER@myhost.test.ex> +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +From: second@example.com +Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Sender: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM-- + diff --git a/test/rejectlog/0570 b/test/rejectlog/0570 index a1acc1559..63f236a55 100644 --- a/test/rejectlog/0570 +++ b/test/rejectlog/0570 @@ -2,14 +2,16 @@ ******** SERVER ******** 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domA.ex>: discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domC.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domC.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domD.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domE.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domF.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domG.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domH.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domK.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domL.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domM.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domN.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domP.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domP.ex>: discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domQ.ex>: discarded by RCPT ACL diff --git a/test/runtest b/test/runtest index fbe30e910..3016e5df6 100755 --- a/test/runtest +++ b/test/runtest @@ -358,6 +358,7 @@ open(IN, "$file") || tests_exit(-1, "Failed to open $file: $!"); my($is_log) = $file =~ /log/; my($is_stdout) = $file =~ /stdout/; my($is_stderr) = $file =~ /stderr/; +my($is_mail) = $file =~ /mail/; # Date pattern @@ -420,12 +421,6 @@ RESET_AFTER_EXTRA_LINE_READ: s?prvs=([^/]+)/[\da-f]{10}@?prvs=$1/xxxxxxxxxx@?g; # Old form s?prvs=[\da-f]{10}=([^@]+)@?prvs=xxxxxxxxxx=$1@?g; # New form - # Error lines on stdout from SSL contain process id values and file names. - # They also contain a source file name and line number, which may vary from - # release to release. - s/^\d+:error:/pppp:error:/; - s/:(?:\/[^\s:]+\/)?([^\/\s]+\.c):\d+:/:$1:dddd:/; - # There are differences in error messages between OpenSSL versions s/SSL_CTX_set_cipher_list/SSL_connect/; @@ -889,15 +884,25 @@ RESET_AFTER_EXTRA_LINE_READ: } } + # remote IPv6 addrs vary + s/^(Connection request from) \[.*:.*:.*\]$/$1 \[ipv6\]/; + # openssl version variances - next if /^SSL info: unknown state/; - next if /^SSL info: SSLv2\/v3 write client hello A/; - next if /^SSL info: SSLv3 read server key exchange A/; + # Error lines on stdout from SSL contain process id values and file names. + # They also contain a source file name and line number, which may vary from + # release to release. + + next if /^SSL info:/; next if /SSL verify error: depth=0 error=certificate not trusted/; s/SSL3_READ_BYTES/ssl3_read_bytes/i; + s/^\d+:error:\d+(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/; # gnutls version variances next if /^Error in the pull function./; + + # optional IDN2 variant conversions. Accept either IDN1 or IDN2 + s/conversion strasse.de/conversion xn--strae-oqa.de/; + s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/; } # ======== stderr ======== @@ -1140,6 +1145,13 @@ RESET_AFTER_EXTRA_LINE_READ: next if / Berkeley DB error: /; } + elsif ($is_mail) + { + # Experimental_DSN info in bounces + next if /^Remote-MTA: /; + next if /^X-Exim-Diagnostic: /; + } + # ======== All files other than stderr ======== print MUNGED; diff --git a/test/scripts/0000-Basic/0570 b/test/scripts/0000-Basic/0570 index 75ac0cec6..8f8c0b2da 100644 --- a/test/scripts/0000-Basic/0570 +++ b/test/scripts/0000-Basic/0570 @@ -12,7 +12,7 @@ exim -q **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domC.ex usery@domD.ex Test message **** # Equivalent explicit case: can multi-domain @@ -20,14 +20,17 @@ exim -DOPTION=multi_domain=yes -q **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domE.ex usery@domF.ex Test message **** -# no multi-domain +# no multi-domain: 2nd rcpt is deferred since parallel is disabled exim -DOPTION=multi_domain=no -q +**** +exim -DOPTION=multi_domain=no -qf +**** # # -exim userx@domA.ex usery@domB.ex +exim userx@domG.ex usery@domH.ex Test message **** # Expanded case: can multi-domain @@ -35,33 +38,38 @@ exim -DOPTION='multi_domain=${if bool{1} {true}{false}}' -q **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domK.ex usery@domL.ex Test message **** # Expanded case: no multi-domain (1) -exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q +exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -q +**** +exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -qf **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domM.ex usery@domN.ex Test message **** # Expanded case: no multi-domain (2) -exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domB.ex} {no}{yes}}' -q +exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -q +**** +exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -qf **** # # -exim userx@domA.ex usery@domA.ex userz@domC.ex +exim userx@domP.ex usery@domP.ex userz@domQ.ex Test message **** # Expanded case: both yes and no -exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q +exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -q +**** +exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -qf **** # # killdaemon no_msglog_check -sortlog # # ## diff --git a/test/scripts/4510-DKIM-Bounces/4510 b/test/scripts/4510-DKIM-Bounces/4510 new file mode 100644 index 000000000..531dbdafd --- /dev/null +++ b/test/scripts/4510-DKIM-Bounces/4510 @@ -0,0 +1,15 @@ +# DKIM signing and bounces +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# single header signed +# one rcpt accept, one reject - should get a DSN +exim -odf baduser@test.ex okuser@test.ex +From: nobody@example.com +From: second@example.com + +content +**** +millisleep 500 +killdaemon diff --git a/test/scripts/4510-DKIM-Bounces/REQUIRES b/test/scripts/4510-DKIM-Bounces/REQUIRES new file mode 100644 index 000000000..a75b81c54 --- /dev/null +++ b/test/scripts/4510-DKIM-Bounces/REQUIRES @@ -0,0 +1,2 @@ +support DKIM +support PRDR diff --git a/test/stdout/1008 b/test/stdout/1008 index f930d30a5..9122d3d05 100644 --- a/test/stdout/1008 +++ b/test/stdout/1008 @@ -31,7 +31,7 @@ QUIT 250 OK Expected EOF read from client Listening on port 1224 ... -Connection request from [::] +Connection request from [ipv6] 220 Server ready EHLO the.local.host.name 250-server id diff --git a/test/stdout/1010 b/test/stdout/1010 index cacc1541b..b8cd645e5 100644 --- a/test/stdout/1010 +++ b/test/stdout/1010 @@ -12,43 +12,43 @@ ******** SERVER ******** Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] QUERY-1 >LF>ANSWER-1 >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] QUERY-2 >>ANSWER-2 >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] QUERY-3 >LF>ANSWER-3 >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] QUERY-4 >LF>ANSWER-4 >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] >>ANSWER-5 >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] *sleep 1 >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] >*eof Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] QUERY-8 *sleep 2 Expected EOF read from client Listening on port 1224 ... -Connection request from [::1] +Connection request from [ipv6] QUERY-9 *sleep 2 Expected EOF read from client diff --git a/test/stdout/2102 b/test/stdout/2102 index ec0a7c921..0d96d1279 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<CALLER@test.ex> @@ -70,19 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<"name with spaces"@test.ex> @@ -122,20 +96,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read server session ticket A -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected @@ -160,22 +121,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<CALLER@test.ex> diff --git a/test/stdout/2102.debian8 b/test/stdout/2102.debian8 deleted file mode 100644 index e512c398b..000000000 --- a/test/stdout/2102.debian8 +++ /dev/null @@ -1,164 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<CALLER@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<"name with spaces"@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaY-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 -Failed to start TLS -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem -Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<CALLER@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message from a verified host. ->>> . -??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script - -**** SMTP testing session as if from host 10.0.0.1 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - -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
diff --git a/test/stdout/2103 b/test/stdout/2103 index bf79d4217..f987fe59c 100644 --- a/test/stdout/2103 +++ b/test/stdout/2103 @@ -18,19 +18,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> @@ -63,19 +50,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> helo rhu.barb diff --git a/test/stdout/2103.debian8 b/test/stdout/2103.debian8 deleted file mode 100644 index d445aea3e..000000000 --- a/test/stdout/2103.debian8 +++ /dev/null @@ -1,82 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 550 -<<< 550 unacceptable cipher TLSv1:AES256-SHA:256 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> helo rhu.barb -??? 250 -<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1] ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2105 b/test/stdout/2105 index 4faa84d50..5395110c7 100644 --- a/test/stdout/2105 +++ b/test/stdout/2105 @@ -24,19 +24,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> diff --git a/test/stdout/2105.debian8 b/test/stdout/2105.debian8 deleted file mode 100644 index 72e4f0c51..000000000 --- a/test/stdout/2105.debian8 +++ /dev/null @@ -1,42 +0,0 @@ -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 ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@remote.test.ex> -??? 550 -<<< 550 encryption required ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@remote.test.ex> -??? 250 -<<< 250 Accepted ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2106 b/test/stdout/2106 index 25b649cf4..3c6dc5d36 100644 --- a/test/stdout/2106 +++ b/test/stdout/2106 @@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS +++ 3 diff --git a/test/stdout/2106.debian8 b/test/stdout/2106.debian8 deleted file mode 100644 index 54e9e06d7..000000000 --- a/test/stdout/2106.debian8 +++ /dev/null @@ -1,28 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -+++ 3 -End of script diff --git a/test/stdout/2114 b/test/stdout/2114 index 050519979..7020b0c57 100644 --- a/test/stdout/2114 +++ b/test/stdout/2114 @@ -18,20 +18,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read server session ticket A -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -54,21 +41,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> helo rhu.barb @@ -106,22 +78,6 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> @@ -156,22 +112,6 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> @@ -206,21 +146,7 @@ Key file = aux-fixed/cert1 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read server session ticket A -pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -245,22 +171,6 @@ Key file = aux-fixed/cert1 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> @@ -297,21 +207,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read server session ticket A -pppp:error:14094414:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:[...]:SSL alert number 44 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -336,22 +232,6 @@ Key file = aux-fixed/cert1 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> diff --git a/test/stdout/2114.debian8 b/test/stdout/2114.debian8 deleted file mode 100644 index b02d2dd7c..000000000 --- a/test/stdout/2114.debian8 +++ /dev/null @@ -1,274 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 -Failed to start TLS -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> helo rhu.barb -??? 250 -<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1] ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 550 -<<< 550 certificate not verified: peerdn= ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 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 [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert1 -Key file = aux-fixed/cert1 -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 -Failed to start TLS -End of script -Connecting to 127.0.0.1 port 1225 ... connected -Certificate file = aux-fixed/cert1 -Key file = aux-fixed/cert1 -??? 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 [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 550- -<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test -??? 550 -<<< 550 Suite/CN=Phil Pennock ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -pppp:error:14094414:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44 -Failed to start TLS -End of script -Connecting to 127.0.0.1 port 1225 ... connected -Certificate file = aux-fixed/cert1 -Key file = aux-fixed/cert1 -??? 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 [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 550- -<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test -??? 550 -<<< 550 Suite/CN=Phil Pennock ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2118 b/test/stdout/2118 index 0359564ba..c026a063b 100644 --- a/test/stdout/2118 +++ b/test/stdout/2118 @@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> diff --git a/test/stdout/2118.debian8 b/test/stdout/2118.debian8 deleted file mode 100644 index 98f17c3c9..000000000 --- a/test/stdout/2118.debian8 +++ /dev/null @@ -1,69 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 550 -<<< 550 "You must encrypt" ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2119 b/test/stdout/2119 index dd74cb469..5fffd603a 100644 --- a/test/stdout/2119 +++ b/test/stdout/2119 @@ -1,18 +1,5 @@ Connecting to 127.0.0.1 port 1225 ... connected Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS ??? 220 @@ -49,22 +36,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Certificate file = aux-fixed/cert2 Key file = aux-fixed/cert2 Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS ??? 220 diff --git a/test/stdout/2119.debian8 b/test/stdout/2119.debian8 deleted file mode 100644 index 92cbd6e4e..000000000 --- a/test/stdout/2119.debian8 +++ /dev/null @@ -1,67 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -??? 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 [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message from a verified host. ->>> . -??? 250 -<<< 250 OK id=10HmaY-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2122 b/test/stdout/2122 index 55feb8f41..8fe3d56a2 100644 --- a/test/stdout/2122 +++ b/test/stdout/2122 @@ -18,19 +18,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> help diff --git a/test/stdout/2122.debian8 b/test/stdout/2122.debian8 deleted file mode 100644 index c44db97c7..000000000 --- a/test/stdout/2122.debian8 +++ /dev/null @@ -1,35 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> help -??? 214- -<<< 214-Commands supported: -??? 214 -<<< 214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2124 b/test/stdout/2124 index 9a7a744c5..166f39657 100644 --- a/test/stdout/2124 +++ b/test/stdout/2124 @@ -20,21 +20,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read server session ticket A -pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected diff --git a/test/stdout/2124.debian8 b/test/stdout/2124.debian8 deleted file mode 100644 index c7fef405d..000000000 --- a/test/stdout/2124.debian8 +++ /dev/null @@ -1,50 +0,0 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 -Failed to start TLS -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 454 -<<< 454 TLS currently unavailable -Abandoning TLS start attempt -End of script diff --git a/test/stdout/2128 b/test/stdout/2128 index e0a0c3b00..b251b4cc4 100644 --- a/test/stdout/2128 +++ b/test/stdout/2128 @@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> quit @@ -39,19 +26,6 @@ Succeeded in starting TLS End of script Connecting to 127.0.0.1 port 1226 ... connected Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS ??? 220 diff --git a/test/stdout/2128.debian8 b/test/stdout/2128.debian8 deleted file mode 100644 index 2c4f98316..000000000 --- a/test/stdout/2128.debian8 +++ /dev/null @@ -1,55 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1226 ... connected -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -??? 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 [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2132 b/test/stdout/2132 index 97aca85c1..322237463 100644 --- a/test/stdout/2132 +++ b/test/stdout/2132 @@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<CALLER@test.ex> @@ -70,19 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<"name with spaces"@test.ex> @@ -122,20 +96,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read server session ticket A -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected @@ -160,22 +121,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<CALLER@test.ex> diff --git a/test/stdout/2132.debian8 b/test/stdout/2132.debian8 deleted file mode 100644 index 3744d44b9..000000000 --- a/test/stdout/2132.debian8 +++ /dev/null @@ -1,164 +0,0 @@ -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<CALLER@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<"name with spaces"@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaY-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 -Failed to start TLS -End of script -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 -??? 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 [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<CALLER@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message from a verified host. ->>> . -??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script - -**** SMTP testing session as if from host 10.0.0.1 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - -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
diff --git a/test/stdout/2150 b/test/stdout/2150 index 8580754c1..75f7c5b54 100644 --- a/test/stdout/2150 +++ b/test/stdout/2150 @@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> diff --git a/test/stdout/2150.debian8 b/test/stdout/2150.debian8 deleted file mode 100644 index 70b247e07..000000000 --- a/test/stdout/2150.debian8 +++ /dev/null @@ -1,39 +0,0 @@ -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 ->>> ehlo abcd -??? 250- -<<< 250-myhost.test.ex Hello abcd [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> data -??? 354 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test message. ->>> . -+++ 1 -End of script diff --git a/test/stdout/2190 b/test/stdout/2190 index c1ee9ffcf..9d386bdf7 100644 --- a/test/stdout/2190 +++ b/test/stdout/2190 @@ -20,19 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> EHLO rhu.barb @@ -89,19 +76,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> EHLO rhu.barb diff --git a/test/stdout/2190.debian8 b/test/stdout/2190.debian8 deleted file mode 100644 index 2bb8156ce..000000000 --- a/test/stdout/2190.debian8 +++ /dev/null @@ -1,120 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250-STARTTLS -<<< 250-STARTTLS -??? 250 HELP -<<< 250 HELP ->>> STARTTLS -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250 HELP -<<< 250 HELP ->>> MAIL FROM:<someone@some.domain> -??? 250 -<<< 250 OK ->>> RCPT TO:<CALLER@test.ex> -??? 250 -<<< 250 Accepted ->>> BDAT 88 LAST ->>> To: Susan@random.com ->>> From: Sam@random.com ->>> Subject: This is a bodyless test message ->>> -??? 250- -<<< 250- 88 byte chunk, total 88 -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> QUIT -??? 221 -<<< 221 testhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250-STARTTLS -<<< 250-STARTTLS -??? 250 HELP -<<< 250 HELP ->>> STARTTLS -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250 HELP -<<< 250 HELP ->>> MAIL FROM:<someone@some.domain> ->>> RCPT TO:<CALLER@test.ex> ->>> BDAT 88 LAST ->>> To: Susan@random.com ->>> From: Sam@random.com ->>> Subject: This is a bodyless test message ->>> -??? 250 -<<< 250 OK -??? 250 -<<< 250 Accepted -??? 250- -<<< 250- 88 byte chunk, total 88 -??? 250 -<<< 250 OK id=10HmaY-0005vi-00 ->>> QUIT -??? 221 -<<< 221 testhost.test.ex closing connection -End of script diff --git a/test/stdout/3450 b/test/stdout/3450 index bbb4db1c2..5efba0069 100644 --- a/test/stdout/3450 +++ b/test/stdout/3450 @@ -48,18 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> ehlo foobar diff --git a/test/stdout/3450.debian8 b/test/stdout/3450.debian8 deleted file mode 100644 index bddcb4deb..000000000 --- a/test/stdout/3450.debian8 +++ /dev/null @@ -1,76 +0,0 @@ -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 503 -<<< 503 STARTTLS required before AUTH ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/3454 b/test/stdout/3454 index d60485e6c..eec5221b5 100644 --- a/test/stdout/3454 +++ b/test/stdout/3454 @@ -20,18 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 TLS <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -60,18 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 TLS <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> ehlo foobar diff --git a/test/stdout/3454.debian8 b/test/stdout/3454.debian8 deleted file mode 100644 index 66dc56386..000000000 --- a/test/stdout/3454.debian8 +++ /dev/null @@ -1,80 +0,0 @@ -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 ->>> ehlo foobar -??? 250-myhost -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-AUTH -<<< 250-AUTH PLAIN -??? 250-STARTTLS -<<< 250-STARTTLS -??? 250 HELP -<<< 250 HELP ->>> starttls -??? 220 TLS -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 503 -<<< 503 AUTH command used when not advertised -End of script -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 ->>> ehlo foobar -??? 250-myhost -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-AUTH -<<< 250-AUTH PLAIN -??? 250-STARTTLS -<<< 250-STARTTLS -??? 250 HELP -<<< 250 HELP ->>> starttls -??? 220 TLS -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> ehlo foobar -??? 250-myhost -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-AUTH -<<< 250-AUTH PLAIN -??? 250 HELP -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/3460 b/test/stdout/3460 index e77771e9d..5efba0069 100644 --- a/test/stdout/3460 +++ b/test/stdout/3460 @@ -48,19 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> ehlo foobar diff --git a/test/stdout/3460.debian8 b/test/stdout/3460.debian8 deleted file mode 100644 index bddcb4deb..000000000 --- a/test/stdout/3460.debian8 +++ /dev/null @@ -1,76 +0,0 @@ -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 503 -<<< 503 STARTTLS required before AUTH ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/3463 b/test/stdout/3463 index 859d8b166..60ba9d3a9 100644 --- a/test/stdout/3463 +++ b/test/stdout/3463 @@ -20,19 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -67,19 +54,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> auth plain AHVzZXJ4AHNlY3JldA== diff --git a/test/stdout/3463.debian8 b/test/stdout/3463.debian8 deleted file mode 100644 index ae1ce3e33..000000000 --- a/test/stdout/3463.debian8 +++ /dev/null @@ -1,76 +0,0 @@ -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 503 -<<< 503 AUTH command used when not advertised ->>> mail from:<x@y> size=1234 -??? 501 -<<< 501 <x@y> size=1234: malformed address: size=1234 may not follow <x@y> ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> mail from:<x@y> size=1234 -??? 250 -<<< 250 OK ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/3464 b/test/stdout/3464 index 4ec7dcc0b..3668f5e8a 100644 --- a/test/stdout/3464 +++ b/test/stdout/3464 @@ -20,19 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> auth plain AHVzZXJ4AHNlY3JldA== @@ -61,19 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> ehlo foobar diff --git a/test/stdout/3464.debian8 b/test/stdout/3464.debian8 deleted file mode 100644 index 5e6162d5f..000000000 --- a/test/stdout/3464.debian8 +++ /dev/null @@ -1,80 +0,0 @@ -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 503 -<<< 503 AUTH command used when not advertised -End of script -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 ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> ehlo foobar -??? 250- -<<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-AUTH PLAIN -??? 250 -<<< 250 HELP ->>> auth plain AHVzZXJ4AHNlY3JldA== -??? 235 -<<< 235 Authentication succeeded ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/5600 b/test/stdout/5600 index d2d28dce6..9af94384a 100644 --- a/test/stdout/5600 +++ b/test/stdout/5600 @@ -20,23 +20,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A Response verify OK -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> @@ -71,23 +55,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization no response received -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS End of script @@ -113,23 +81,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization no response received -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS End of script @@ -155,22 +107,6 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> ehlo rhu.barb.tls diff --git a/test/stdout/5600.debian8 b/test/stdout/5600.debian8 deleted file mode 100644 index 039f5152f..000000000 --- a/test/stdout/5600.debian8 +++ /dev/null @@ -1,140 +0,0 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -Response verify OK -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> quit -??? 221 -<<< 221 server1.example.com closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -no response received -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -no response received -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> ehlo rhu.barb.tls -??? 250- -<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> quit -End of script diff --git a/test/stdout/5610 b/test/stdout/5610 index d2d28dce6..9af94384a 100644 --- a/test/stdout/5610 +++ b/test/stdout/5610 @@ -20,23 +20,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A Response verify OK -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> @@ -71,23 +55,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization no response received -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS End of script @@ -113,23 +81,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization no response received -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS End of script @@ -155,22 +107,6 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSLv3 read server hello A -SSL info: SSLv3 read server certificate A -SSL info: SSLv3 read server certificate request A -SSL info: SSLv3 read server done A -SSL info: SSLv3 write client certificate A -SSL info: SSLv3 write client key exchange A -SSL info: SSLv3 write certificate verify A -SSL info: SSLv3 write change cipher spec A -SSL info: SSLv3 write finished A -SSL info: SSLv3 flush data -SSL info: SSLv3 read server session ticket A -SSL info: SSLv3 read finished A -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS >>> ehlo rhu.barb.tls diff --git a/test/stdout/5610.debian8 b/test/stdout/5610.debian8 deleted file mode 100644 index 039f5152f..000000000 --- a/test/stdout/5610.debian8 +++ /dev/null @@ -1,140 +0,0 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -Response verify OK -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> mail from:<userx@test.ex> -??? 250 -<<< 250 OK ->>> rcpt to:<userx@test.ex> -??? 250 -<<< 250 Accepted ->>> quit -??? 221 -<<< 221 server1.example.com closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -no response received -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -no response received -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -??? 220 -<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -SSL info: before/connect initialization -SSL info: before/connect initialization -SSL info: SSL negotiation finished successfully -SSL info: SSL negotiation finished successfully -SSL connection using AES256-SHA -Succeeded in starting TLS ->>> ehlo rhu.barb.tls -??? 250- -<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> quit -End of script |