summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_internal.h
diff options
context:
space:
mode:
authorjsing <>2018-02-08 10:19:31 +0000
committerjsing <>2018-02-08 10:19:31 +0000
commitba784f0df690dc69577e1ee14a448cda91b89262 (patch)
treefbaa7b6f7b55a0e6130366b9d6bb63fa8074d471 /src/lib/libtls/tls_internal.h
parent939cef15b79268da075126b9cf88c8578d0ad48c (diff)
downloadopenbsd-ba784f0df690dc69577e1ee14a448cda91b89262.tar.gz
openbsd-ba784f0df690dc69577e1ee14a448cda91b89262.tar.bz2
openbsd-ba784f0df690dc69577e1ee14a448cda91b89262.zip
Have tls_keypair_pubkey_hash() call tls_keypair_load_cert() instead of
rolling its own certificate loading. This also means we get better error reporting on failure.
Diffstat (limited to 'src/lib/libtls/tls_internal.h')
-rw-r--r--src/lib/libtls/tls_internal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index 8a164d2e3a..eb08d47074 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.67 2018/02/08 08:09:10 jsing Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.68 2018/02/08 10:19:31 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>
@@ -214,7 +214,8 @@ void tls_keypair_clear(struct tls_keypair *_keypair);
214void tls_keypair_free(struct tls_keypair *_keypair); 214void tls_keypair_free(struct tls_keypair *_keypair);
215int tls_keypair_load_cert(struct tls_keypair *_keypair, 215int tls_keypair_load_cert(struct tls_keypair *_keypair,
216 struct tls_error *_error, X509 **_cert); 216 struct tls_error *_error, X509 **_cert);
217int tls_keypair_pubkey_hash(struct tls_keypair *_keypair, char **_hash); 217int tls_keypair_pubkey_hash(struct tls_keypair *_keypair,
218 struct tls_error *_error, char **_hash);
218 219
219struct tls_sni_ctx *tls_sni_ctx_new(void); 220struct tls_sni_ctx *tls_sni_ctx_new(void);
220void tls_sni_ctx_free(struct tls_sni_ctx *sni_ctx); 221void tls_sni_ctx_free(struct tls_sni_ctx *sni_ctx);