diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2015-12-03 22:29:06 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-12-03 22:29:06 +0100 |
| commit | b72f452d6fef4115d0f60615201359987ec40ae7 (patch) | |
| tree | 3490589650697240bdbff6b07a7cb86e6f982ff0 /roles/common | |
| parent | ffa5719da70e6314f50959bd23ff097fd3783257 (diff) | |
Postfix TLS policy: Store the fingerprint of the cert's pubkey, not of the cert itself.
Diffstat (limited to 'roles/common')
| -rw-r--r-- | roles/common/templates/etc/postfix/tls_policy.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/common/templates/etc/postfix/tls_policy.j2 b/roles/common/templates/etc/postfix/tls_policy.j2 index 352ef3e..5330d11 100644 --- a/roles/common/templates/etc/postfix/tls_policy.j2 +++ b/roles/common/templates/etc/postfix/tls_policy.j2 @@ -4,7 +4,7 @@ {% if 'out' not in group_names %} [outgoing.fripost.org]:{{ postfix_instance.out.port }} fingerprint ciphers=high protocols=!SSLv2:!SSLv3:!TLSv1:!TLSv1.1 {% for h in groups.out | sort %} - match={{ lookup('pipe', 'openssl x509 -in certs/postfix/'+h+'.pem -noout -fingerprint -sha256 | cut -d= -f2') }} + match={{ lookup('pipe', 'openssl x509 -in certs/postfix/'+h+'.pem -noout -pubkey | openssl pkey -pubin -outform DER | openssl dgst -sha256 -c | sed "s/[^ =]*=\s*//"') }} {% endfor %} {% endif %} @@ -12,14 +12,14 @@ {% if 'IMAP' not in group_names %} [mda.fripost.org]:{{ postfix_instance.IMAP.port }} fingerprint ciphers=high protocols=!SSLv2:!SSLv3:!TLSv1:!TLSv1.1 {% for h in groups.IMAP | sort %} - match={{ lookup('pipe', 'openssl x509 -in certs/postfix/'+h+'.pem -noout -fingerprint -sha256 | cut -d= -f2') }} + match={{ lookup('pipe', 'openssl x509 -in certs/postfix/'+h+'.pem -noout -pubkey | openssl pkey -pubin -outform DER | openssl dgst -sha256 -c | sed "s/[^ =]*=\s*//"') }} {% endfor %} {% endif %} {% if 'lists' not in group_names %} [lists.fripost.org]:{{ postfix_instance.lists.port }} fingerprint ciphers=high protocols=!SSLv2:!SSLv3:!TLSv1:!TLSv1.1 {% for h in groups.lists | sort %} - match={{ lookup('pipe', 'openssl x509 -in certs/postfix/'+h+'.pem -noout -fingerprint -sha256 | cut -d= -f2') }} + match={{ lookup('pipe', 'openssl x509 -in certs/postfix/'+h+'.pem -noout -pubkey | openssl pkey -pubin -outform DER | openssl dgst -sha256 -c | sed "s/[^ =]*=\s*//"') }} {% endfor %} {% endif %} {% endif %} |