Add support for TLSv1.3 enabling and disabling

It already worked automatically; this just adds the options to enable
and disable the protocol version explicitly.

diff --git a/doc/config.md b/doc/config.md
index d7d8f87ab836cb265e445124382be8ca78320b56..b06d6b95cb335ae61708390c2840a1129e5b5adf 100644 (file)
--- a/doc/config.md
+++ b/doc/config.md
@@ -551,8 +551,8 @@ Default: unset.
 
 ### client_tls_protocols
 
-Which TLS protocol versions are allowed.  Allowed values: `tlsv1.0`, `tlsv1.1`, `tlsv1.2`.
-Shortcuts: `all` (tlsv1.0,tlsv1.1,tlsv1.2), `secure` (tlsv1.2), `legacy` (all).
+Which TLS protocol versions are allowed.  Allowed values: `tlsv1.0`, `tlsv1.1`, `tlsv1.2`, `tlsv1.3`.
+Shortcuts: `all` (tlsv1.0,tlsv1.1,tlsv1.2,tlsv1.3), `secure` (tlsv1.2,tlsv1.3), `legacy` (all).
 
 Default: `all`
 
@@ -626,8 +626,8 @@ Default: not set.
 
 ### server_tls_protocols
 
-Which TLS protocol versions are allowed.  Allowed values: `tlsv1.0`, `tlsv1.1`, `tlsv1.2`.
-Shortcuts: `all` (tlsv1.0,tlsv1.1,tlsv1.2), `secure` (tlsv1.2), `legacy` (all).
+Which TLS protocol versions are allowed.  Allowed values: `tlsv1.0`, `tlsv1.1`, `tlsv1.2`, `tlsv1.3`.
+Shortcuts: `all` (tlsv1.0,tlsv1.1,tlsv1.2,tlsv1.3), `secure` (tlsv1.2,tlsv1.3), `legacy` (all).
 
 Default: `all`
 

diff --git a/etc/pgbouncer.ini b/etc/pgbouncer.ini
index 67cc94eea706d2c0f3555f63411abde2b30f6484..fed6db12b80e257e0e2c9f9cf5046e677e13ee8d 100644 (file)
--- a/etc/pgbouncer.ini
+++ b/etc/pgbouncer.ini
@@ -68,7 +68,7 @@ listen_port = 6432
 ;; fast, normal, secure, legacy, <ciphersuite string>
 ;client_tls_ciphers = fast
 
-;; all, secure, tlsv1.0, tlsv1.1, tlsv1.2
+;; all, secure, tlsv1.0, tlsv1.1, tlsv1.2, tlsv1.3
 ;client_tls_protocols = all
 
 ;; none, auto, legacy
@@ -92,7 +92,7 @@ listen_port = 6432
 ;server_tls_key_file =
 ;server_tls_cert_file =
 
-;; all, secure, tlsv1.0, tlsv1.1, tlsv1.2
+;; all, secure, tlsv1.0, tlsv1.1, tlsv1.2, tlsv1.3
 ;server_tls_protocols = all
 
 ;; fast, normal, secure, legacy, <ciphersuite string>

diff --git a/lib b/lib
index ada40b0f544971fd822b422ef37061a4f5abf2ac..404edd367c7eb458b6ee48b521e6f70502a7b719 160000 (submodule)
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit ada40b0f544971fd822b422ef37061a4f5abf2ac
+Subproject commit 404edd367c7eb458b6ee48b521e6f70502a7b719