mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: ssl_sock_load_crt_file_into_ckch

Browse Source 
Fix comments for this function and remove free before alloc call: ckch
call is correctly balanced  (alloc/free).
This commit is contained in:
Emmanuel Hocdet 2018-12-04 17:37:47 +01:00 committed by William Lallemand
parent 54227d8add
commit efa4b95b78
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl_sock.c
View File

@ -2937,11 +2937,11 @@ static int ssl_sock_is_ckch_valid(struct cert_key_and_chain *ckch)
/* Loads the contents of a crt file (path) into a cert_key_and_chain /* Loads the contents of a crt file (path) into a cert_key_and_chain
* This allows us to carry the contents of the file without having to * This allows us to carry the contents of the file without having to
* read the file multiple times. * read the file multiple times.
* The caller must call ssl_sock_free_cert_key_and_chain_contents.
* *
* returns: * returns:
* 0 on Success * 0 on Success
* 1 on SSL Failure * 1 on SSL Failure
* 2 on file not found
*/ */
static int ssl_sock_load_crt_file_into_ckch(const char *path, struct cert_key_and_chain *ckch, char **err) static int ssl_sock_load_crt_file_into_ckch(const char *path, struct cert_key_and_chain *ckch, char **err)
{ {
@ -2950,8 +2950,6 @@ static int ssl_sock_load_crt_file_into_ckch(const char *path, struct cert_key_an
X509 *ca; X509 *ca;
int ret = 1; int ret = 1;
ssl_sock_free_cert_key_and_chain_contents(ckch);
in = BIO_new(BIO_s_file()); in = BIO_new(BIO_s_file());
if (in == NULL) if (in == NULL)
goto end; goto end;