diff options
Diffstat (limited to 'tests/tls-sni')
| -rw-r--r-- | tests/tls-sni/remote.conf | 4 | ||||
| -rw-r--r-- | tests/tls-sni/t | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/tls-sni/remote.conf b/tests/tls-sni/remote.conf index 4ccfb44..ef76cf9 100644 --- a/tests/tls-sni/remote.conf +++ b/tests/tls-sni/remote.conf @@ -2,6 +2,6 @@ !include conf.d/ssl.conf local_name imap.example.net { - ssl_cert = <conf.d/dovecot.rsa2.crt - ssl_key = <conf.d/dovecot.rsa2.key + ssl_server_cert_file = conf.d/dovecot.rsa2.crt + ssl_server_key_file = conf.d/dovecot.rsa2.key } diff --git a/tests/tls-sni/t b/tests/tls-sni/t index f18b8b0..7692f74 100644 --- a/tests/tls-sni/t +++ b/tests/tls-sni/t @@ -1,9 +1,9 @@ SERVERNAME="imap.example.net" # cf local_name{} section in the dovecot config -X509_SHA256="$(doveconf -c "$HOME_remote/.dovecot/config" -hx ssl_cert \ - | openssl x509 -noout -fingerprint -sha256 \ +ssl_server_cert_file="$(doveconf -c "$HOME_remote/.dovecot/config" -hx ssl_server/cert_file)" +X509_SHA256="$(openssl x509 -in "$ssl_server_cert_file" -noout -fingerprint -sha256 \ | sed -rn "/^.*=\\s*/ {s///p;q}" | tr -d : | tr "[A-Z]" "[a-z]")" -X509_2_SHA256="$(doveconf -c "$HOME_remote/.dovecot/config" -f lname="$SERVERNAME" -hx ssl_cert \ - | openssl x509 -noout -fingerprint -sha256 \ +ssl_server_cert_file2="$(doveconf -c "$HOME_remote/.dovecot/config" -f local_name="$SERVERNAME" -hx ssl_server/cert_file)" +X509_2_SHA256="$(openssl x509 -in "$ssl_server_cert_file2" -noout -fingerprint -sha256 \ | sed -rn "/^.*=\\s*/ {s///p;q}" | tr -d : | tr "[A-Z]" "[a-z]")" # check that empty SSL_hostname disables SNI @@ -63,4 +63,4 @@ echo "SSL_CAfile = $HOME/.dovecot/conf.d/ca.crt" >>"$XDG_CONFIG_HOME/interimap/c interimap --debug || error sni_ok -# vim: set filetype=sh : +# vim: set filetype=bash : |