RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-17 11:06:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: ssl: Remove useless checks on bind_conf or bind_conf->is_ssl

Browse Source 
bind_conf always exists at these steps and it is always for SSL listeners.
This commit is contained in:
Christopher Faulet 2017-09-15 09:52:49 +02:00 committed by Willy Tarreau
parent 3bbd65b23e
commit f8bb0ce450
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl_sock.c
View File

@ -4226,9 +4226,6 @@ int ssl_sock_prepare_all_ctx(struct bind_conf *bind_conf)
struct sni_ctx *sni; struct sni_ctx *sni;
int err = 0; int err = 0;
if (!bind_conf || !bind_conf->is_ssl)
return 0;
/* Automatic memory computations need to know we use SSL there */ /* Automatic memory computations need to know we use SSL there */
global.ssl_used_frontend = 1; global.ssl_used_frontend = 1;
@ -4333,9 +4330,6 @@ void ssl_sock_free_all_ctx(struct bind_conf *bind_conf)
struct ebmb_node *node, *back; struct ebmb_node *node, *back;
struct sni_ctx *sni; struct sni_ctx *sni;
if (!bind_conf || !bind_conf->is_ssl)
return;
node = ebmb_first(&bind_conf->sni_ctx); node = ebmb_first(&bind_conf->sni_ctx);
while (node) { while (node) {
sni = ebmb_entry(node, struct sni_ctx, name); sni = ebmb_entry(node, struct sni_ctx, name);
@ -4400,7 +4394,7 @@ ssl_sock_load_ca(struct bind_conf *bind_conf)
EVP_PKEY *capkey = NULL; EVP_PKEY *capkey = NULL;
int err = 0; int err = 0;
if (!bind_conf || !bind_conf->generate_certs) if (!bind_conf->generate_certs)
return err; return err;
#if (defined SSL_CTRL_SET_TLSEXT_HOSTNAME && !defined SSL_NO_GENERATE_CERTIFICATES) #if (defined SSL_CTRL_SET_TLSEXT_HOSTNAME && !defined SSL_NO_GENERATE_CERTIFICATES)
@ -4453,9 +4447,6 @@ ssl_sock_load_ca(struct bind_conf *bind_conf)
void void
ssl_sock_free_ca(struct bind_conf *bind_conf) ssl_sock_free_ca(struct bind_conf *bind_conf)
{ {
if (!bind_conf)
return;
if (bind_conf->ca_sign_pkey) if (bind_conf->ca_sign_pkey)
EVP_PKEY_free(bind_conf->ca_sign_pkey); EVP_PKEY_free(bind_conf->ca_sign_pkey);
if (bind_conf->ca_sign_cert) if (bind_conf->ca_sign_cert)