summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libtls/tls_internal.h')
-rw-r--r--src/lib/libtls/tls_internal.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index 65b65371b2..1db186a05f 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.49 2016/11/05 14:50:05 beck Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.50 2016/11/05 15:13:26 beck 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>
@@ -67,6 +67,8 @@ struct tls_config {
67 int ecdhecurve; 67 int ecdhecurve;
68 struct tls_keypair *keypair; 68 struct tls_keypair *keypair;
69 int ocsp_require_stapling; 69 int ocsp_require_stapling;
70 char *ocsp_staple;
71 size_t ocsp_staple_len;
70 uint32_t protocols; 72 uint32_t protocols;
71 int verify_cert; 73 int verify_cert;
72 int verify_client; 74 int verify_client;
@@ -110,10 +112,6 @@ struct tls_ocsp {
110 /* responder location */ 112 /* responder location */
111 char *ocsp_url; 113 char *ocsp_url;
112 114
113 /* request blob */
114 uint8_t *request_data;
115 size_t request_size;
116
117 /* cert data, this struct does not own these */ 115 /* cert data, this struct does not own these */
118 X509 *main_cert; 116 X509 *main_cert;
119 STACK_OF(X509) *extra_certs; 117 STACK_OF(X509) *extra_certs;
@@ -208,6 +206,7 @@ int tls_conninfo_populate(struct tls *ctx);
208void tls_conninfo_free(struct tls_conninfo *conninfo); 206void tls_conninfo_free(struct tls_conninfo *conninfo);
209 207
210int tls_ocsp_verify_cb(SSL *ssl, void *arg); 208int tls_ocsp_verify_cb(SSL *ssl, void *arg);
209int tls_ocsp_stapling_cb(SSL *ssl, void *arg);
211void tls_ocsp_free(struct tls_ocsp *ctx); 210void tls_ocsp_free(struct tls_ocsp *ctx);
212struct tls_ocsp *tls_ocsp_setup_from_peer(struct tls *ctx); 211struct tls_ocsp *tls_ocsp_setup_from_peer(struct tls *ctx);
213 212