diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/3820 | 48 | ||||
| -rw-r--r-- | test/confs/3825 | 66 | ||||
| l---------[-rw-r--r--] | test/confs/3828 | 67 |
3 files changed, 103 insertions, 78 deletions
diff --git a/test/confs/3820 b/test/confs/3820 index 023ed751d..b60e467a3 100644 --- a/test/confs/3820 +++ b/test/confs/3820 @@ -27,16 +27,16 @@ client_r: begin transports smtp: - driver = smtp - hosts = 127.0.0.1 + driver = smtp + hosts = 127.0.0.1 allow_localhost - port = PORT_D + port = PORT_D .ifdef TRUSTED - hosts_require_tls = * + hosts_require_tls = * tls_verify_certificates = DIR/aux-fixed/cert1 tls_verify_cert_hostnames = : .endif - hosts_require_auth = * + hosts_require_auth = * # ----- Authentication ----- @@ -44,14 +44,14 @@ begin authenticators .ifndef TRUSTED sasl1: - driver = gsasl - public_name = ANONYMOUS + driver = gsasl + public_name = ANONYMOUS server_set_id = $auth1 server_condition = true sasl2: - driver = gsasl - public_name = PLAIN + driver = gsasl + public_name = PLAIN server_set_id = $auth1 server_condition = ${if eq {$auth3}{pencil}} @@ -61,13 +61,13 @@ sasl2: .endif sasl3: - driver = gsasl + driver = gsasl .ifdef TRUSTED - public_name = SCRAM-SHA-1-PLUS + public_name = SCRAM-SHA-1-PLUS server_advertise_condition = ${if def:tls_in_cipher} server_channelbinding = true .else - public_name = SCRAM-SHA-1 + public_name = SCRAM-SHA-1 .endif # will need to give library salt, stored-key, server-key, itercount @@ -89,5 +89,29 @@ sasl3: client_channelbinding = true .endif +.ifdef _HAVE_AUTH_GSASL_SCRAM_SHA_256 +sasl4: + driver = gsasl +.ifdef TRUSTED + public_name = SCRAM-SHA-256-PLUS + server_advertise_condition = ${if def:tls_in_cipher} + server_channelbinding = true +.else + public_name = SCRAM-SHA-256 +.endif + + server_scram_salt = QSXCR+Q6sek8bf92 + server_password = pencil + server_condition = true + server_set_id = $auth1 + + client_condition = ${if eq {scram_sha_256}{$local_part}} + client_username = ph10 + client_password = pencil +.ifdef TRUSTED + client_channelbinding = true +.endif +.endif + # End diff --git a/test/confs/3825 b/test/confs/3825 new file mode 100644 index 000000000..61483569f --- /dev/null +++ b/test/confs/3825 @@ -0,0 +1,66 @@ +# Exim test configuration 3825 + +SERVER= + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +queue_only + + +begin routers + +client_r: + driver = accept + condition = ${if !eq {SERVER}{server}} + transport = smtp + +begin transports + +smtp: + driver = smtp + hosts = 127.0.0.1 + allow_localhost + port = PORT_D + hosts_require_auth = * + +# ----- Authentication ----- + +begin authenticators + +.ifndef OPT +sasl1: + driver = plaintext + public_name = PLAIN + server_prompts = : + server_condition = ${if and {{eq{$auth2}{ph10}}{eq{$auth3}{mysecret}}}} + server_set_id = $auth2 + +sasl2: + driver = gsasl + public_name = PLAIN + client_condition = ${if eq {plain}{$local_part}} + client_username = ph10 + client_password = mysecret + +.else +sasl3: + driver = gsasl + public_name = PLAIN + server_condition = ${if and {{eq{$auth1}{ph10}}{eq{$auth3}{mysecret}}}} + server_set_id = $auth1 + +sasl4: + driver = plaintext + public_name = PLAIN + client_condition = ${if eq {plain}{$local_part}} + client_send = ^ph10^mysecret + +.endif + + +# End diff --git a/test/confs/3828 b/test/confs/3828 index aa9db9467..d8f3286c4 100644..120000 --- a/test/confs/3828 +++ b/test/confs/3828 @@ -1,66 +1 @@ -# Exim test configuration 3828 - -SERVER= - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept -queue_only - - -begin routers - -client_r: - driver = accept - condition = ${if !eq {SERVER}{server}} - transport = smtp - -begin transports - -smtp: - driver = smtp - hosts = 127.0.0.1 - allow_localhost - port = PORT_D - hosts_require_auth = * - -# ----- Authentication ----- - -begin authenticators - -.ifndef OPT -sasl1: - driver = plaintext - public_name = PLAIN - server_prompts = : - server_condition = ${if and {{eq{$auth2}{ph10}}{eq{$auth3}{mysecret}}}} - server_set_id = $auth2 - -sasl2: - driver = gsasl - public_name = PLAIN - client_condition = ${if eq {plain}{$local_part}} - client_username = ph10 - client_password = mysecret - -.else -sasl3: - driver = gsasl - public_name = PLAIN - server_condition = ${if and {{eq{$auth1}{ph10}}{eq{$auth3}{mysecret}}}} - server_set_id = $auth1 - -sasl4: - driver = plaintext - public_name = PLAIN - client_condition = ${if eq {plain}{$local_part}} - client_send = ^ph10^mysecret - -.endif - - -# End +3820
\ No newline at end of file |