summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_internal.h
diff options
context:
space:
mode:
authorjsing <>2018-04-18 16:29:11 +0000
committerjsing <>2018-04-18 16:29:11 +0000
commitb8fcd25d8f670b12fe45071e4f1134aeee9e91c9 (patch)
tree44affb5a07039f42624d1d901698b321dff47315 /src/lib/libtls/tls_internal.h
parent703709c912d7164363d5c57ba4df6c4b67f19423 (diff)
downloadopenbsd-b8fcd25d8f670b12fe45071e4f1134aeee9e91c9.tar.gz
openbsd-b8fcd25d8f670b12fe45071e4f1134aeee9e91c9.tar.bz2
openbsd-b8fcd25d8f670b12fe45071e4f1134aeee9e91c9.zip
Limit tls_config_clear_keys() to only clearing private keys.
This was inadvertently clearing the keypair, which includes the OCSP staple and pubkey hash - if an application called tls_configure() followed by tls_config_clear_keys(), this would prevent OCSP staples from working. ok beck@
Diffstat (limited to 'src/lib/libtls/tls_internal.h')
-rw-r--r--src/lib/libtls/tls_internal.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index 0d7e2289d3..1746a1aabc 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_internal.h,v 1.71 2018/03/19 16:34:47 jsing Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.71.2.1 2018/04/18 16:29:11 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -199,6 +199,7 @@ int tls_set_mem(char **_dest, size_t *_destlen, const void *_src,
199int tls_set_string(const char **_dest, const char *_src); 199int tls_set_string(const char **_dest, const char *_src);
200 200
201struct tls_keypair *tls_keypair_new(void); 201struct tls_keypair *tls_keypair_new(void);
202void tls_keypair_clear_key(struct tls_keypair *_keypair);
202void tls_keypair_clear(struct tls_keypair *_keypair); 203void tls_keypair_clear(struct tls_keypair *_keypair);
203void tls_keypair_free(struct tls_keypair *_keypair); 204void tls_keypair_free(struct tls_keypair *_keypair);
204int tls_keypair_set_cert_file(struct tls_keypair *_keypair, 205int tls_keypair_set_cert_file(struct tls_keypair *_keypair,