stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tls: rename input argument to tls_add_ca (#158)

Browse source
This commit is contained in:
Alfred E. Heggestad 2018-10-16 08:51:32 +02:00 • committed by Richard Aas
parent 856043b335
commit ee6b5e0a91
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/re_tls.h
View file

@ -32,7 +32,7 @@ enum tls_keytype {
int tls_alloc(struct tls **tlsp, enum tls_method method, const char *keyfile, int tls_alloc(struct tls **tlsp, enum tls_method method, const char *keyfile,
const char *pwd); const char *pwd);
int tls_add_ca(struct tls *tls, const char *capath); int tls_add_ca(struct tls *tls, const char *cafile);
int tls_set_selfsigned(struct tls *tls, const char *cn); int tls_set_selfsigned(struct tls *tls, const char *cn);
int tls_set_certificate_pem(struct tls *tls, const char *cert, size_t len_cert, int tls_set_certificate_pem(struct tls *tls, const char *cert, size_t len_cert,
const char *key, size_t len_key); const char *key, size_t len_key);

10
src/tls/openssl/tls.c
View file

@ -208,18 +208,18 @@ int tls_alloc(struct tls **tlsp, enum tls_method method, const char *keyfile,
* Set default locations for trusted CA certificates * Set default locations for trusted CA certificates
* *
* @param tls TLS Context * @param tls TLS Context
* @param capath Path to CA certificates * @param cafile PEM file with CA certificates
* *
* @return 0 if success, otherwise errorcode * @return 0 if success, otherwise errorcode
*/ */
int tls_add_ca(struct tls *tls, const char *capath) int tls_add_ca(struct tls *tls, const char *cafile)
{ {
if (!tls || !capath) if (!tls || !cafile)
return EINVAL; return EINVAL;
/* Load the CAs we trust */ /* Load the CAs we trust */
if (!(SSL_CTX_load_verify_locations(tls->ctx, capath, 0))) { if (!(SSL_CTX_load_verify_locations(tls->ctx, cafile, NULL))) {
DEBUG_WARNING("Can't read CA list: %s\n", capath); DEBUG_WARNING("Can't read CA file: %s\n", cafile);
ERR_clear_error(); ERR_clear_error();
return EINVAL; return EINVAL;
} }