summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libtls/tls_config.c')
-rw-r--r--src/lib/libtls/tls_config.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c
index 8f0bd70508..fe049d1e4e 100644
--- a/src/lib/libtls/tls_config.c
+++ b/src/lib/libtls/tls_config.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_config.c,v 1.40 2017/05/06 20:59:28 jsing Exp $ */ 1/* $OpenBSD: tls_config.c,v 1.41 2017/07/06 17:12:22 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -268,6 +268,7 @@ tls_config_free(struct tls_config *config)
268 free((char *)config->ca_mem); 268 free((char *)config->ca_mem);
269 free((char *)config->ca_path); 269 free((char *)config->ca_path);
270 free((char *)config->ciphers); 270 free((char *)config->ciphers);
271 free((char *)config->crl_mem);
271 272
272 free(config); 273 free(config);
273} 274}
@@ -299,6 +300,7 @@ tls_config_clear_keys(struct tls_config *config)
299 tls_keypair_clear(kp); 300 tls_keypair_clear(kp);
300 301
301 tls_config_set_ca_mem(config, NULL, 0); 302 tls_config_set_ca_mem(config, NULL, 0);
303 tls_config_set_crl_mem(config, NULL, 0);
302} 304}
303 305
304int 306int
@@ -579,6 +581,20 @@ tls_config_set_ciphers(struct tls_config *config, const char *ciphers)
579} 581}
580 582
581int 583int
584tls_config_set_crl_file(struct tls_config *config, const char *crl_file)
585{
586 return tls_config_load_file(&config->error, "CRL", crl_file,
587 &config->crl_mem, &config->crl_len);
588}
589
590int
591tls_config_set_crl_mem(struct tls_config *config, const uint8_t *crl,
592 size_t len)
593{
594 return set_mem(&config->crl_mem, &config->crl_len, crl, len);
595}
596
597int
582tls_config_set_dheparams(struct tls_config *config, const char *params) 598tls_config_set_dheparams(struct tls_config *config, const char *params)
583{ 599{
584 int keylen; 600 int keylen;