diff options
| author |   jsing <jsing@openbsd.org> | 2017-01-23 05:13:02 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-01-23 05:13:02 +0000 |
| commit | 1d51f822e326152afaa63f92515d0e41ed6a6dd3 (patch) | |
| tree | 326e71c3996fe3d796d0214a7cab53d8c7bf6a70 /lib/libssl/s3_lib.c | |
| parent | pledge a tiny bit later. This results in the specified tty being (diff) | |
| download | wireguard-openbsd-1d51f822e326152afaa63f92515d0e41ed6a6dd3.tar.xz wireguard-openbsd-1d51f822e326152afaa63f92515d0e41ed6a6dd3.zip | |
Move most of the fields in SSL_CTX to internal - the ones that remain are
known to be in use.
ok beck@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 8e52c8bb4a4..3e44d5e4c17 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.123 2017/01/23 04:55:26 beck Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.124 2017/01/23 05:13:02 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2195,7 +2195,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) { CERT *cert; - cert = ctx->cert; + cert = ctx->internal->cert; switch (cmd) { case SSL_CTRL_NEED_TMP_RSA: @@ -2225,7 +2225,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) return (0); case SSL_CTRL_SET_DH_AUTO: - ctx->cert->dh_tmp_auto = larg; + ctx->internal->cert->dh_tmp_auto = larg; return (1); case SSL_CTRL_SET_TMP_ECDH: @@ -2279,16 +2279,16 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) return 0; } if (cmd == SSL_CTRL_SET_TLSEXT_TICKET_KEYS) { - memcpy(ctx->tlsext_tick_key_name, keys, 16); - memcpy(ctx->tlsext_tick_hmac_key, + memcpy(ctx->internal->tlsext_tick_key_name, keys, 16); + memcpy(ctx->internal->tlsext_tick_hmac_key, keys + 16, 16); - memcpy(ctx->tlsext_tick_aes_key, keys + 32, 16); + memcpy(ctx->internal->tlsext_tick_aes_key, keys + 32, 16); } else { - memcpy(keys, ctx->tlsext_tick_key_name, 16); + memcpy(keys, ctx->internal->tlsext_tick_key_name, 16); memcpy(keys + 16, - ctx->tlsext_tick_hmac_key, 16); + ctx->internal->tlsext_tick_hmac_key, 16); memcpy(keys + 32, - ctx->tlsext_tick_aes_key, 16); + ctx->internal->tlsext_tick_aes_key, 16); } return 1; } @@ -2299,7 +2299,7 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) break; case SSL_CTRL_SET_ECDH_AUTO: - ctx->cert->ecdh_tmp_auto = larg; + ctx->internal->cert->ecdh_tmp_auto = larg; return 1; /* A Thawte special :-) */ @@ -2333,7 +2333,7 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) { CERT *cert; - cert = ctx->cert; + cert = ctx->internal->cert; switch (cmd) { case SSL_CTRL_SET_TMP_RSA_CB: |