From: Willy Tarreau <w@1wt.eu>
Date: Tue, 17 Dec 2024 14:02:39 +0000 (+0100)
Subject: CLEANUP: ssl-sock: drop two now unneeded ALREADY_CHECKED()
X-Git-Tag: v3.2-dev2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93d4e9d50fa1269e94d8a1572b6746b3c26e78e0;p=thirdparty%2Fhaproxy.git

CLEANUP: ssl-sock: drop two now unneeded ALREADY_CHECKED()

In ssl_sock_bind_verifycbk() a BUG_ON() checks the validity of "ctx" and
"bind_conf". There was a pair of ALREADY_CHECKED() macros after BUG_ON()
for the case where DEBUG_STRICT=0. But this is now addressed so we can
remove these two macros and rely on the BUG_ON() instead.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 856cb05f04..f2577f9abf 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -1471,8 +1471,6 @@ int ssl_sock_bind_verifycbk(int ok, X509_STORE_CTX *x_store)
 #endif
 
 	BUG_ON(!ctx || !bind_conf);
-	ALREADY_CHECKED(ctx);
-	ALREADY_CHECKED(bind_conf);
 
 	ctx->xprt_st |= SSL_SOCK_ST_FL_VERIFY_DONE;