diff options
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index ae2586912c..92f4c49aa8 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.121 2017/01/23 01:22:08 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.122 2017/01/23 04:15:28 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 | * |
@@ -2265,7 +2265,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | |||
2265 | } | 2265 | } |
2266 | break; | 2266 | break; |
2267 | case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG: | 2267 | case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG: |
2268 | ctx->tlsext_servername_arg = parg; | 2268 | ctx->internal->tlsext_servername_arg = parg; |
2269 | break; | 2269 | break; |
2270 | case SSL_CTRL_SET_TLSEXT_TICKET_KEYS: | 2270 | case SSL_CTRL_SET_TLSEXT_TICKET_KEYS: |
2271 | case SSL_CTRL_GET_TLSEXT_TICKET_KEYS: | 2271 | case SSL_CTRL_GET_TLSEXT_TICKET_KEYS: |
@@ -2294,7 +2294,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | |||
2294 | } | 2294 | } |
2295 | 2295 | ||
2296 | case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG: | 2296 | case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG: |
2297 | ctx->tlsext_status_arg = parg; | 2297 | ctx->internal->tlsext_status_arg = parg; |
2298 | return 1; | 2298 | return 1; |
2299 | break; | 2299 | break; |
2300 | 2300 | ||
@@ -2346,16 +2346,16 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) | |||
2346 | cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp; | 2346 | cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp; |
2347 | break; | 2347 | break; |
2348 | case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB: | 2348 | case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB: |
2349 | ctx->tlsext_servername_callback = | 2349 | ctx->internal->tlsext_servername_callback = |
2350 | (int (*)(SSL *, int *, void *))fp; | 2350 | (int (*)(SSL *, int *, void *))fp; |
2351 | break; | 2351 | break; |
2352 | 2352 | ||
2353 | case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB: | 2353 | case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB: |
2354 | ctx->tlsext_status_cb = (int (*)(SSL *, void *))fp; | 2354 | ctx->internal->tlsext_status_cb = (int (*)(SSL *, void *))fp; |
2355 | break; | 2355 | break; |
2356 | 2356 | ||
2357 | case SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB: | 2357 | case SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB: |
2358 | ctx->tlsext_ticket_key_cb = (int (*)(SSL *, unsigned char *, | 2358 | ctx->internal->tlsext_ticket_key_cb = (int (*)(SSL *, unsigned char *, |
2359 | unsigned char *, EVP_CIPHER_CTX *, HMAC_CTX *, int))fp; | 2359 | unsigned char *, EVP_CIPHER_CTX *, HMAC_CTX *, int))fp; |
2360 | break; | 2360 | break; |
2361 | 2361 | ||