summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authorjsing <>2018-02-17 15:08:21 +0000
committerjsing <>2018-02-17 15:08:21 +0000
commitca5a90bc040c87944d3af58d51c80de05b02c60b (patch)
treeaacdd412fb71ab5d0466f64cd0603eaa1c31d0f2 /src/lib/libssl/s3_lib.c
parent3b7cdf9c768759bfba3e3afd3a234cc44ef4c7c1 (diff)
downloadopenbsd-ca5a90bc040c87944d3af58d51c80de05b02c60b.tar.gz
openbsd-ca5a90bc040c87944d3af58d51c80de05b02c60b.tar.bz2
openbsd-ca5a90bc040c87944d3af58d51c80de05b02c60b.zip
Provide SSL_CTX_get_tlsext_status_cb() and SSL_CTX_get_tlsext_status_arg().
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index a15003b053..8f75cf9498 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_lib.c,v 1.163 2018/01/27 15:09:15 jsing Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.164 2018/02/17 15:08:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2134,6 +2134,13 @@ _SSL_CTX_set_tlsext_ticket_keys(SSL_CTX *ctx, unsigned char *keys, int keys_len)
2134} 2134}
2135 2135
2136static int 2136static int
2137_SSL_CTX_get_tlsext_status_arg(SSL_CTX *ctx, void **arg)
2138{
2139 *arg = ctx->internal->tlsext_status_arg;
2140 return 1;
2141}
2142
2143static int
2137_SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg) 2144_SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg)
2138{ 2145{
2139 ctx->internal->tlsext_status_arg = arg; 2146 ctx->internal->tlsext_status_arg = arg;
@@ -2215,6 +2222,9 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
2215 case SSL_CTRL_SET_TLSEXT_TICKET_KEYS: 2222 case SSL_CTRL_SET_TLSEXT_TICKET_KEYS:
2216 return _SSL_CTX_set_tlsext_ticket_keys(ctx, parg, larg); 2223 return _SSL_CTX_set_tlsext_ticket_keys(ctx, parg, larg);
2217 2224
2225 case SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG:
2226 return _SSL_CTX_get_tlsext_status_arg(ctx, parg);
2227
2218 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG: 2228 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG:
2219 return _SSL_CTX_set_tlsext_status_arg(ctx, parg); 2229 return _SSL_CTX_set_tlsext_status_arg(ctx, parg);
2220 2230
@@ -2279,6 +2289,10 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
2279 (int (*)(SSL *, int *, void *))fp; 2289 (int (*)(SSL *, int *, void *))fp;
2280 return 1; 2290 return 1;
2281 2291
2292 case SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB:
2293 *(int (**)(SSL *, void *))fp = ctx->internal->tlsext_status_cb;
2294 return 1;
2295
2282 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB: 2296 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB:
2283 ctx->internal->tlsext_status_cb = (int (*)(SSL *, void *))fp; 2297 ctx->internal->tlsext_status_cb = (int (*)(SSL *, void *))fp;
2284 return 1; 2298 return 1;