From 46f5bec5af1307aab981ef77d6d8beae74552328 Mon Sep 17 00:00:00 2001
From: Tom Hendrikx <tom@whyscream.net>
Date: Mon, 29 Jan 2024 22:01:26 +0100
Subject: [PATCH] Convert new postfix_tls_* keys to use underscore separators
 only

Also: convert signature_size parameter to integer.
---
 50-filter-postfix.conf | 1 +
 postfix.grok           | 2 +-
 test/smtpd_0037.yaml   | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/50-filter-postfix.conf b/50-filter-postfix.conf
index 712cfe6..cb5932e 100644
--- a/50-filter-postfix.conf
+++ b/50-filter-postfix.conf
@@ -277,6 +277,7 @@ filter {
             "postfix_size", "integer",
             "postfix_status_code", "integer",
             "postfix_termination_signal", "integer",
+            "postfix_tls_server_signature_size", "integer",
             "postfix_verify_cache_dropped", "integer",
             "postfix_verify_cache_retained", "integer",
 
diff --git a/postfix.grok b/postfix.grok
index 90008fb..fa08503 100644
--- a/postfix.grok
+++ b/postfix.grok
@@ -23,7 +23,7 @@ POSTFIX_KEYVALUE %{POSTFIX_QUEUEID:postfix_queueid}: %{POSTFIX_KEYVALUE_DATA:pos
 POSTFIX_WARNING_LEVEL (warning|fatal|info)
 POSTFIX_VERIFY_CLEANUP_TYPE (full|partial)
 
-POSTFIX_TLSCONN (Anonymous|Trusted|Untrusted|Verified) TLS connection established (to %{POSTFIX_RELAY_INFO}|from %{POSTFIX_CLIENT_INFO}): %{DATA:postfix_tls_version} with cipher %{DATA:postfix_tls_cipher} \(%{DATA:postfix_tls_cipher_size} bits\)( key-exchange %{DATA:postfix_tls_key-exchange} server-signature %{DATA:postfix_tls_server-signature} \(%{DATA:postfix_tls_server-signature_size} bits\) server-digest %{DATA:postfix_tls_server-digest})?
+POSTFIX_TLSCONN (Anonymous|Trusted|Untrusted|Verified) TLS connection established (to %{POSTFIX_RELAY_INFO}|from %{POSTFIX_CLIENT_INFO}): %{DATA:postfix_tls_version} with cipher %{DATA:postfix_tls_cipher} \(%{DATA:postfix_tls_cipher_size} bits\)( key-exchange %{DATA:postfix_tls_key_exchange} server-signature %{DATA:postfix_tls_server_signature} \(%{DATA:postfix_tls_server_signature_size} bits\) server-digest %{DATA:postfix_tls_server_digest})?
 POSTFIX_TLSVERIFICATION certificate verification failed for %{POSTFIX_RELAY_INFO}: %{GREEDYDATA:postfix_tls_error}
 
 POSTFIX_DELAYS %{NUMBER:postfix_delay_before_qmgr}/%{NUMBER:postfix_delay_in_qmgr}/%{NUMBER:postfix_delay_conn_setup}/%{NUMBER:postfix_delay_transmission}
diff --git a/test/smtpd_0037.yaml b/test/smtpd_0037.yaml
index 32ccb95..ff6c278 100644
--- a/test/smtpd_0037.yaml
+++ b/test/smtpd_0037.yaml
@@ -6,7 +6,7 @@ results:
     postfix_tls_version: TLSv1.3
     postfix_tls_cipher: TLS_AES_256_GCM_SHA384
     postfix_tls_cipher_size: 256/256
-    postfix_tls_key-exchange: X25519 
-    postfix_tls_server-signature: RSA-PSS 
-    postfix_tls_server-signature_size: 4096
-    postfix_tls_server-digest: SHA256
+    postfix_tls_key_exchange: X25519
+    postfix_tls_server_signature: RSA-PSS
+    postfix_tls_server_signature_size: 4096
+    postfix_tls_server_digest: SHA256