From: William Lallemand <wlallemand@haproxy.com>
Date: Mon, 4 Nov 2019 12:38:53 +0000 (+0100)
Subject: BUG/MINOR: ssl/cli: unable to update a certificate without bundle extension
X-Git-Tag: v2.1-dev5~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37031b85ca83df351aede46487d93642ba5896d1;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl/cli: unable to update a certificate without bundle extension

Commit bc6ca7c ("MINOR: ssl/cli: rework 'set ssl cert' as 'set/commit'")
broke the ability to commit a unique certificate which does not use a
bundle extension .{rsa,ecdsa,dsa}.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 98b3ad8b71..7b2f1021cd 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -10327,6 +10327,8 @@ static int cli_parse_set_cert(char **args, char *payload, struct appctx *appctx,
 						break;
 					}
 				}
+				if (bundle < 0) /* we didn't find a bundle extension */
+					break;
 			}
 #else
 			/* bundles are not supported here, so we don't need to lookup again */