Merge ~paelzer/ubuntu/+source/haproxy:bug-1841936-openssl1.1.1-tlsv13-focal into ubuntu/+source/haproxy:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1841936-haproxy-openssl/+packages
Focal doesn't build in PPA yet it seems, but it is identical to the Eoan version (except version number)

[Christian Ehrhardt  (paelzer)]

Umm now it built, so ok

4cd9cf4... by Christian Ehrhardt  on 2019-10-28

dp/lp-1841936-*: mark Applied Upstream to help dropping changes later

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Note: Upstream already accepted it also in all stable branches, so we can mark it to help dropping the Delta later.
Pushed to this series (not important for the SRUs).

[Christian Ehrhardt  (paelzer)]

syncing 2.0.8 from Debian already.
This MP isn't needed anymore (but the SRU MPs are)

Unmerged commits

4cd9cf4... by Christian Ehrhardt  on 2019-10-28

dp/lp-1841936-*: mark Applied Upstream to help dropping changes later

Signed-off-by: Christian Ehrhardt <email address hidden>

d6cca36... by Christian Ehrhardt  on 2019-10-23

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

965d3a1... by Christian Ehrhardt  on 2019-10-23

changelog: Fix issues around dh_params when building against openssl 1.1.1 (LP: #1841936)

Signed-off-by: Christian Ehrhardt <email address hidden>

238cc15... by Christian Ehrhardt  on 2019-10-23

* Fix issues around dh_params when building against openssl 1.1.1 (LP: #1841936)
  - d/p/lp-1841936-BUG-MEDIUM-ssl-tune.ssl.default-dh-param-value-ignor.patch
  - d/p/lp-1841936-CLEANUP-ssl-make-ssl_sock_load_dh_params-handle-errc.patch

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 2733720..1bcd82d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 haproxy (2.0.8-1) unstable; urgency=medium
 
   * New upstream release.
@@ -30,6 +31,16 @@ haproxy (2.0.6-1) unstable; urgency=medium
     - BUG/MAJOR: ssl: ssl_sock was not fully initialized.
 
  -- Vincent Bernat <[e-mail]>  Fri, 13 Sep 2019 21:25:38 +0200
+=======
+haproxy (2.0.5-1ubuntu1) focal; urgency=medium
+
+  * Fix configurability of dh_params that regressed since building
+    against openssl 1.1.1 (LP: 1841936)
+    - d/p/lp-1841936-BUG-MEDIUM-ssl-tune.ssl.default-dh-param-value-ignor.patch
+    - d/p/lp-1841936-CLEANUP-ssl-make-ssl_sock_load_dh_params-handle-errc.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 23 Oct 2019 12:58:09 +0200
+>>>>>>> debian/changelog
 
 haproxy (2.0.5-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ca8eb40..d120f6e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: haproxy
 Section: net
 Priority: optional
-Maintainer: Debian HAProxy Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HAProxy Maintainers <[e-mail]>
 Uploaders: Apollon Oikonomopoulos <[e-mail]>,
            Prach Pongpanich <[e-mail]>,
            Vincent Bernat <[e-mail]>
diff --git a/debian/patches/lp-1841936-BUG-MEDIUM-ssl-tune.ssl.default-dh-param-value-ignor.patch b/debian/patches/lp-1841936-BUG-MEDIUM-ssl-tune.ssl.default-dh-param-value-ignor.patch
new file mode 100644
index 0000000..b8a9128
--- /dev/null
+++ b/debian/patches/lp-1841936-BUG-MEDIUM-ssl-tune.ssl.default-dh-param-value-ignor.patch
@@ -0,0 +1,131 @@
+From d6de151248603b357565ae52fe92440e66c1177c Mon Sep 17 00:00:00 2001
+From: Emeric Brun <[e-mail]>
+Date: Thu, 17 Oct 2019 14:53:03 +0200
+Subject: [PATCH] BUG/MEDIUM: ssl: 'tune.ssl.default-dh-param' value ignored
+ with openssl > 1.1.1
+
+If openssl 1.1.1 is used, c2aae74f0 commit mistakenly enables DH automatic
+feature from openssl instead of ECDH automatic feature. There is no impact for
+the ECDH one because the feature is always enabled for that version. But doing
+this, the 'tune.ssl.default-dh-param' was completely ignored for DH parameters.
+
+This patch fix the bug calling 'SSL_CTX_set_ecdh_auto' instead of
+'SSL_CTX_set_dh_auto'.
+
+Currently some users may use a 2048 DH bits parameter, thinking they're using a
+1024 bits one. Doing this, they may experience performance issue on light hardware.
+
+This patch warns the user if haproxy fails to configure the given DH parameter.
+In this case and if openssl version is > 1.1.0, haproxy will let openssl to
+automatically choose a default DH parameter. For other openssl versions, the DH
+ciphers won't be usable.
+
+A commonly case of failure is due to the security level of openssl.cnf
+which could refuse a 1024 bits DH parameter for a 2048 bits key:
+
+ $ cat /etc/ssl/openssl.cnf
+ ...
+
+ [system_default_sect]
+ MinProtocol = TLSv1
+ CipherString = DEFAULT@SECLEVEL=2
+
+This should be backport into any branch containing the commit c2aae74f0.
+It requires all or part of the previous CLEANUP series.
+
+This addresses github issue #324.
+
+(cherry picked from commit 6624a90a9ac2edb947a8c70fa6a8a283449750c6)
+Signed-off-by: Emeric Brun <[e-mail]>
+
+Origin: upstream, http://git.haproxy.org/?p=haproxy-2.0.git;a=commit;h=d6de151248603b357565ae52fe92440e66c1177c
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1841936
+Applied-Upstream: v2.1-dev3 1.8.22 2.0.8
+Last-Update: 2019-10-23
+
+---
+ src/ssl_sock.c | 47 +++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 43 insertions(+), 4 deletions(-)
+
+diff --git a/src/ssl_sock.c b/src/ssl_sock.c
+index ec961ffe4..b1961f3c1 100644
+--- a/src/ssl_sock.c
++++ b/src/ssl_sock.c
+@@ -2759,7 +2759,20 @@ static int ssl_sock_load_dh_params(SSL_CTX *ctx, const char *file, char **err)
+ 	DH *dh = ssl_sock_get_dh_from_file(file);
+ 
+ 	if (dh) {
+-		SSL_CTX_set_tmp_dh(ctx, dh);
++		if (!SSL_CTX_set_tmp_dh(ctx, dh)) {
++			memprintf(err, "%sunable to load the DH parameter specified in '%s'",
++				  err && *err ? *err : "", file);
++#if defined(SSL_CTX_set_dh_auto)
++			SSL_CTX_set_dh_auto(ctx, 1);
++			memprintf(err, "%s, SSL library will use an automatically generated DH parameter.\n",
++				  err && *err ? *err : "");
++#else
++			memprintf(err, "%s, DH ciphers won't be available.\n",
++				  err && *err ? *err : "");
++#endif
++			ret |= ERR_WARN;
++			goto end;
++		}
+ 
+ 		if (ssl_dh_ptr_index >= 0) {
+ 			/* store a pointer to the DH params to avoid complaining about
+@@ -2768,7 +2781,20 @@ static int ssl_sock_load_dh_params(SSL_CTX *ctx, const char *file, char **err)
+ 		}
+ 	}
+ 	else if (global_dh) {
+-		SSL_CTX_set_tmp_dh(ctx, global_dh);
++		if (!SSL_CTX_set_tmp_dh(ctx, global_dh)) {
++			memprintf(err, "%sunable to use the global DH parameter for certificate '%s'",
++				  err && *err ? *err : "", file);
++#if defined(SSL_CTX_set_dh_auto)
++			SSL_CTX_set_dh_auto(ctx, 1);
++			memprintf(err, "%s, SSL library will use an automatically generated DH parameter.\n",
++				  err && *err ? *err : "");
++#else
++			memprintf(err, "%s, DH ciphers won't be available.\n",
++				  err && *err ? *err : "");
++#endif
++			ret |= ERR_WARN;
++			goto end;
++		}
+ 	}
+ 	else {
+ 		/* Clear openssl global errors stack */
+@@ -2786,7 +2812,20 @@ static int ssl_sock_load_dh_params(SSL_CTX *ctx, const char *file, char **err)
+ 				goto end;
+ 			}
+ 
+-			SSL_CTX_set_tmp_dh(ctx, local_dh_1024);
++			if (!SSL_CTX_set_tmp_dh(ctx, local_dh_1024)) {
++				memprintf(err, "%sunable to load default 1024 bits DH parameter for certificate '%s'.\n",
++					  err && *err ? *err : "", file);
++#if defined(SSL_CTX_set_dh_auto)
++				SSL_CTX_set_dh_auto(ctx, 1);
++				memprintf(err, "%s, SSL library will use an automatically generated DH parameter.\n",
++					  err && *err ? *err : "");
++#else
++				memprintf(err, "%s, DH ciphers won't be available.\n",
++					  err && *err ? *err : "");
++#endif
++				ret |= ERR_WARN;
++				goto end;
++			}
+ 		}
+ 		else {
+ 			SSL_CTX_set_tmp_dh_callback(ctx, ssl_get_tmp_dh);
+@@ -4496,7 +4535,7 @@ int ssl_sock_prepare_ctx(struct bind_conf *bind_conf, struct ssl_bind_conf *ssl_
+ 			 NULL);
+ 
+ 		if (ecdhe == NULL) {
+-			SSL_CTX_set_dh_auto(ctx, 1);
++			SSL_CTX_set_ecdh_auto(ctx, 1);
+ 			return cfgerr;
+ 		}
+ #else
+-- 
+2.23.0
+
diff --git a/debian/patches/lp-1841936-CLEANUP-ssl-make-ssl_sock_load_dh_params-handle-errc.patch b/debian/patches/lp-1841936-CLEANUP-ssl-make-ssl_sock_load_dh_params-handle-errc.patch
new file mode 100644
index 0000000..e268813
--- /dev/null
+++ b/debian/patches/lp-1841936-CLEANUP-ssl-make-ssl_sock_load_dh_params-handle-errc.patch
@@ -0,0 +1,115 @@
+From cfc1afe9f21ec27612ed4ad84c4a066c68ca24af Mon Sep 17 00:00:00 2001
+From: Emeric Brun <[e-mail]>
+Date: Thu, 17 Oct 2019 13:27:40 +0200
+Subject: [PATCH] CLEANUP: ssl: make ssl_sock_load_dh_params handle
+ errcode/warn
+
+ssl_sock_load_dh_params used to return >0 or -1 to indicate success
+or failure. Make it return a set of ERR_* instead so that its callers
+can transparently report its status. Given that its callers only used
+to know about ERR_ALERT | ERR_FATAL, this is the only code returned
+for now. An error message was added in the case of failure and the
+comment was updated.
+
+(cherry picked from commit 7a88336cf83cd1592fb8e7bc456d72c00c2934e4)
+Signed-off-by: Emeric Brun <[e-mail]>
+
+Backport-Note: context changes as we didn't backport further changes and
+cleanups. Those affect the retval handling of a bunch of functions that
+had to be adapted. We change ret of ssl_sock_load_dh_params as declared
+by the patch but not the further one of ssl_sock_load_cert_file.
+
+Origin: backport, http://git.haproxy.org/?p=haproxy-2.0.git;a=commit;h=cfc1afe9f21ec27612ed4ad84c4a066c68ca24af
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1841936
+Applied-Upstream: v2.1-dev3 1.8.22 2.0.8
+Last-Update: 2019-10-23
+
+---
+ src/ssl_sock.c | 43 +++++++++++++++++++++++++++----------------
+ 1 file changed, 27 insertions(+), 16 deletions(-)
+
+--- a/src/ssl_sock.c
++++ b/src/ssl_sock.c
+@@ -2740,15 +2740,24 @@ int ssl_sock_load_global_dh_param_from_f
+ 	return -1;
+ }
+ 
+-/* Loads Diffie-Hellman parameter from a file. Returns 1 if loaded, else -1
+-   if an error occurred, and 0 if parameter not found. */
+-int ssl_sock_load_dh_params(SSL_CTX *ctx, const char *file)
+-{
+-	int ret = -1;
++/* Loads Diffie-Hellman parameter from a ckchs to an SSL_CTX.
++ *  If there is no DH paramater availaible in the ckchs, the global
++ *  DH parameter is loaded into the SSL_CTX and if there is no
++ *  DH parameter available in ckchs nor in global, the default
++ *  DH parameters are applied on the SSL_CTX.
++ * Returns a bitfield containing the flags:
++ *     ERR_FATAL in any fatal error case
++ *     ERR_ALERT if a reason of the error is availabine in err
++ *     ERR_WARN if a warning is available into err
++ * The value 0 means there is no error nor warning and
++ * the operation succeed.
++ */
++static int ssl_sock_load_dh_params(SSL_CTX *ctx, const char *file, char **err)
++ {
++	int ret = 0;
+ 	DH *dh = ssl_sock_get_dh_from_file(file);
+ 
+ 	if (dh) {
+-		ret = 1;
+ 		SSL_CTX_set_tmp_dh(ctx, dh);
+ 
+ 		if (ssl_dh_ptr_index >= 0) {
+@@ -2759,7 +2768,6 @@ int ssl_sock_load_dh_params(SSL_CTX *ctx
+ 	}
+ 	else if (global_dh) {
+ 		SSL_CTX_set_tmp_dh(ctx, global_dh);
+-		ret = 0; /* DH params not found */
+ 	}
+ 	else {
+ 		/* Clear openssl global errors stack */
+@@ -2770,16 +2778,18 @@ int ssl_sock_load_dh_params(SSL_CTX *ctx
+ 			if (local_dh_1024 == NULL)
+ 				local_dh_1024 = ssl_get_dh_1024();
+ 
+-			if (local_dh_1024 == NULL)
++			if (local_dh_1024 == NULL) {
++				memprintf(err, "%sunable to load default 1024 bits DH parameter for certificate '%s'.\n",
++					  err && *err ? *err : "", file);
++				ret |= ERR_ALERT | ERR_FATAL;
+ 				goto end;
++			}
+ 
+ 			SSL_CTX_set_tmp_dh(ctx, local_dh_1024);
+ 		}
+ 		else {
+ 			SSL_CTX_set_tmp_dh_callback(ctx, ssl_get_tmp_dh);
+ 		}
+-
+-		ret = 0; /* DH params not found */
+ 	}
+ 
+ end:
+@@ -3254,8 +3264,8 @@ static int ssl_sock_load_multi_cert(cons
+ 			if (ssl_dh_ptr_index >= 0)
+ 				SSL_CTX_set_ex_data(cur_ctx, ssl_dh_ptr_index, NULL);
+ 
+-			rv = ssl_sock_load_dh_params(cur_ctx, NULL);
+-			if (rv < 0) {
++			rv = ssl_sock_load_dh_params(cur_ctx, NULL, err);
++			if (rv & ERR_CODE) {
+ 				if (err)
+ 					memprintf(err, "%sunable to load DH parameters from file '%s'.\n",
+ 							*err ? *err : "", path);
+@@ -3485,8 +3495,8 @@ static int ssl_sock_load_cert_file(const
+ 		SSL_CTX_set_ex_data(ctx, ssl_dh_ptr_index, NULL);
+ 	}
+ 
+-	ret = ssl_sock_load_dh_params(ctx, path);
+-	if (ret < 0) {
++	ret = ssl_sock_load_dh_params(ctx, path, err);
++	if (ret & ERR_CODE) {
+ 		if (err)
+ 			memprintf(err, "%sunable to load DH parameters from file '%s'.\n",
+ 				  *err ? *err : "", path);
diff --git a/debian/patches/series b/debian/patches/series
index 64d2dd6..4987953 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ haproxy.service-add-documentation.patch
 
 # applied during the build process:
 # debianize-dconv.patch
+lp-1841936-CLEANUP-ssl-make-ssl_sock_load_dh_params-handle-errc.patch
+lp-1841936-BUG-MEDIUM-ssl-tune.ssl.default-dh-param-value-ignor.patch