mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: clean ret variable in ssl_sock_load_ckchn

Browse Source 
In ssl_sock_load_ckchn, ret variable is now in a half dead usage.
Remove it to clean compilation warnings.
This commit is contained in:
Emmanuel Hocdet 2019-07-30 17:17:03 +02:00 committed by William Lallemand
parent efa4b95b78
commit a7a0f991c9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl_sock.c
View File

@ -3424,7 +3424,6 @@ static int ssl_sock_load_ckchn(const char *path, struct ckch_node *ckch_n, struc
{ {
SSL_CTX *ctx; SSL_CTX *ctx;
int i; int i;
int ret = -1;
int order = 0; int order = 0;
X509_NAME *xname; X509_NAME *xname;
char *str; char *str;
@ -3502,16 +3501,12 @@ static int ssl_sock_load_ckchn(const char *path, struct ckch_node *ckch_n, struc
} }
} }
} }
ret = 0; /* the caller must not free the SSL_CTX argument anymore */
/* we must not free the SSL_CTX anymore below, since it's already in /* we must not free the SSL_CTX anymore below, since it's already in
* the tree, so it will be discovered and cleaned in time. * the tree, so it will be discovered and cleaned in time.
*/ */
#if (defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB && !defined OPENSSL_NO_OCSP) #if (defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB && !defined OPENSSL_NO_OCSP)
ret = ssl_sock_load_ocsp(ctx, path); if (ssl_sock_load_ocsp(ctx, path) < 0) {
if (ret < 0) {
if (err) if (err)
memprintf(err, "%s '%s.ocsp' is present and activates OCSP but it is impossible to compute the OCSP certificate ID (maybe the issuer could not be found)'.\n", memprintf(err, "%s '%s.ocsp' is present and activates OCSP but it is impossible to compute the OCSP certificate ID (maybe the issuer could not be found)'.\n",
*err ? *err : "", path); *err ? *err : "", path);
@ -3523,8 +3518,7 @@ static int ssl_sock_load_ckchn(const char *path, struct ckch_node *ckch_n, struc
#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL) #if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
if (sctl_ex_index >= 0) { if (sctl_ex_index >= 0) {
ret = ssl_sock_load_sctl(ctx, path); if (ssl_sock_load_sctl(ctx, path) < 0) {
if (ret < 0) {
if (err) if (err)
memprintf(err, "%s '%s.sctl' is present but cannot be read or parsed'.\n", memprintf(err, "%s '%s.sctl' is present but cannot be read or parsed'.\n",
*err ? *err : "", path); *err ? *err : "", path);