Skip to content

Commit

Permalink
test suite output changes, merge back
Browse files Browse the repository at this point in the history 
Note that many of these have multiple copies of the same cert.  I think this is an issue w/ smtp-server.pl, not swaks.  See #73
  • Loading branch information
@jetmore
jetmore committed Dec 1, 2023
1 parent f8b8e16 commit b7f4d20
Show file tree
Hide file tree
Showing 56 changed files with 841 additions and 114 deletions.
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00200.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
2 changes: 1 addition & 1 deletion testing/regressions/_exec-transactions/out-ref/00202.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*** TLS startup failed (connect(): error:CODE:SSL routines::sslv3 alert handshake failure)
*** TLS startup failed (connect(): error:CODE:SSL routines::ssl/tls alert handshake failure)
*** STARTTLS attempted but failed
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00207.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,22 @@
=== Connected to %TEST_SERVER% --silent --domain pipe part-0201-intialize-tls.txt part-0000-connect-standard.txt part-0101-ehlo-all.txt part-1000-mail-basic.txt part-1100-rcpt-basic-accept.txt part-2500-data-accept-basic.txt part-3000-shutdown-accept.txt .
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
<~ 220 SERVER ESMTP ready
~> EHLO hserver
Expand Down
2 changes: 1 addition & 1 deletion testing/regressions/_exec-transactions/out-ref/00208.stderr
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*** TLS startup failed (connect(): error:CODE:SSL routines::sslv3 alert handshake failure)
*** TLS startup failed (connect(): error:CODE:SSL routines::ssl/tls alert handshake failure)
22 changes: 20 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00210.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,26 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate requested and sent
=== TLS local DN="/C=US/ST=Indiana/O=Swaks Development (unsigned.example.com, with-SAN)/CN=unsigned.example.com/[email protected]"
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS client DN="/C=US/ST=Indiana/O=Swaks Development (unsigned.example.com, with-SAN)/CN=unsigned.example.com/[email protected]"
=== notBefore=2023-11-03T14:51:48Z
=== notAfter=2033-09-11T14:51:48Z
=== subjectAltName=[ DNS:unsigned.example.com ]
=== commonName=unsigned.example.com
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development/CN=Swaks Root CA/[email protected]"
=== notBefore=2020-12-13T15:28:17Z
=== notAfter=2030-12-11T15:28:17Z
=== subjectAltName=
=== commonName=Swaks Root CA
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development/CN=Swaks Root CA/[email protected]"
=== notBefore=2020-12-13T15:28:17Z
=== notAfter=2030-12-11T15:28:17Z
=== subjectAltName=
=== commonName=Swaks Root CA
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
13 changes: 11 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00211.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,17 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (signed.example.com, with-SAN)/CN=signed.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (signed.example.com, with-SAN)/CN=signed.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:47Z
=== notAfter=2033-09-11T14:50:47Z
=== subjectAltName=[ DNS:signed.example.com ]
=== commonName=signed.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development/CN=Swaks Root CA/[email protected]"
=== notBefore=2020-12-13T15:28:17Z
=== notAfter=2030-12-11T15:28:17Z
=== subjectAltName=
=== commonName=Swaks Root CA
=== TLS peer certificate passed CA verification, failed host verification (no host string available to verify)
~> QUIT
<~ 221 SERVER closing connection
Expand Down
13 changes: 11 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00212.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,17 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (signed.example.com, with-SAN)/CN=signed.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (signed.example.com, with-SAN)/CN=signed.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:47Z
=== notAfter=2033-09-11T14:50:47Z
=== subjectAltName=[ DNS:signed.example.com ]
=== commonName=signed.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development/CN=Swaks Root CA/[email protected]"
=== notBefore=2020-12-13T15:28:17Z
=== notAfter=2030-12-11T15:28:17Z
=== subjectAltName=
=== commonName=Swaks Root CA
=== TLS peer certificate passed CA verification, failed host verification (no host string available to verify)
~> QUIT
<~ 221 SERVER closing connection
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00213.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
=== -----BEGIN CERTIFICATE-----
=== MIIEGjCCAwKgAwIBAgIUFQU5NT2EO9gtC5YP96Fa9d8vFVkwDQYJKoZIhvcNAQEL
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00214.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00215.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00216.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00220.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00221.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
18 changes: 16 additions & 2 deletions testing/regressions/_exec-transactions/out-ref/00222.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,22 @@
<- 220 TLS go ahead
=== TLS started with cipher VERSION:CIPHER:BITS
=== TLS client certificate not requested and not sent
=== TLS no local certificate set
=== TLS peer DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== TLS no client certificate set
=== TLS peer[0] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[1] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer[2] DN="/C=US/ST=Indiana/O=Swaks Development (node.example.com, with-SAN)/CN=node.example.com/[email protected]"
=== notBefore=2023-11-03T14:50:10Z
=== notAfter=2033-09-11T14:50:10Z
=== subjectAltName=[ DNS:node.example.com ]
=== commonName=node.example.com
=== TLS peer certificate failed CA verification, failed host verification (no host string available to verify)
~> EHLO hserver
<~ 250-SERVER Hello Server [1.1.1.1]
Expand Down
Loading

0 comments on commit b7f4d20

Please sign in to comment.