summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libressl/ressl.h3
-rw-r--r--src/lib/libressl/ressl_config.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libressl/ressl.h b/src/lib/libressl/ressl.h
index 192f863f44..9795c3804b 100644
--- a/src/lib/libressl/ressl.h
+++ b/src/lib/libressl/ressl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ressl.h,v 1.14 2014/09/28 06:24:00 tedu Exp $ */ 1/* $OpenBSD: ressl.h,v 1.15 2014/09/28 14:46:09 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -44,6 +44,7 @@ int ressl_config_set_key_mem(struct ressl_config *config, const uint8_t *key,
44void ressl_config_set_verify_depth(struct ressl_config *config, 44void ressl_config_set_verify_depth(struct ressl_config *config,
45 int verify_depth); 45 int verify_depth);
46 46
47void ressl_config_clear_keys(struct ressl_config *config);
47void ressl_config_insecure_no_verify(struct ressl_config *config); 48void ressl_config_insecure_no_verify(struct ressl_config *config);
48void ressl_config_verify(struct ressl_config *config); 49void ressl_config_verify(struct ressl_config *config);
49 50
diff --git a/src/lib/libressl/ressl_config.c b/src/lib/libressl/ressl_config.c
index 5deb8d187f..319bba330d 100644
--- a/src/lib/libressl/ressl_config.c
+++ b/src/lib/libressl/ressl_config.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ressl_config.c,v 1.9 2014/09/28 06:24:00 tedu Exp $ */ 1/* $OpenBSD: ressl_config.c,v 1.10 2014/09/28 14:46:09 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -97,6 +97,13 @@ ressl_config_free(struct ressl_config *config)
97 free(config); 97 free(config);
98} 98}
99 99
100void
101ressl_config_clear_keys(struct ressl_config *config)
102{
103 ressl_config_set_cert_mem(config, NULL, 0);
104 ressl_config_set_key_mem(config, NULL, 0);
105}
106
100int 107int
101ressl_config_set_ca_file(struct ressl_config *config, const char *ca_file) 108ressl_config_set_ca_file(struct ressl_config *config, const char *ca_file)
102{ 109{