diff options
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
| -rw-r--r-- | src/lib/libssl/s3_srvr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index 21849487ea..5717d5edda 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s3_srvr.c,v 1.145 2017/01/23 04:55:27 beck Exp $ */ | 1 | /* $OpenBSD: s3_srvr.c,v 1.146 2017/01/23 05:13:02 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 | * |
| @@ -1129,7 +1129,7 @@ ssl3_send_server_hello(SSL *s) | |||
| 1129 | * so the following won't overwrite an ID that we're supposed | 1129 | * so the following won't overwrite an ID that we're supposed |
| 1130 | * to send back. | 1130 | * to send back. |
| 1131 | */ | 1131 | */ |
| 1132 | if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) | 1132 | if (!(s->ctx->internal->session_cache_mode & SSL_SESS_CACHE_SERVER) |
| 1133 | && !s->hit) | 1133 | && !s->hit) |
| 1134 | s->session->session_id_length = 0; | 1134 | s->session->session_id_length = 0; |
| 1135 | 1135 | ||
| @@ -1553,8 +1553,8 @@ ssl3_send_server_key_exchange(SSL *s) | |||
| 1553 | j = 0; | 1553 | j = 0; |
| 1554 | for (num = 2; num > 0; num--) { | 1554 | for (num = 2; num > 0; num--) { |
| 1555 | if (!EVP_DigestInit_ex(&md_ctx, | 1555 | if (!EVP_DigestInit_ex(&md_ctx, |
| 1556 | (num == 2) ? s->ctx->md5 : | 1556 | (num == 2) ? s->ctx->internal->md5 : |
| 1557 | s->ctx->sha1, NULL)) | 1557 | s->ctx->internal->sha1, NULL)) |
| 1558 | goto err; | 1558 | goto err; |
| 1559 | EVP_DigestUpdate(&md_ctx, | 1559 | EVP_DigestUpdate(&md_ctx, |
| 1560 | s->s3->client_random, | 1560 | s->s3->client_random, |
| @@ -2751,10 +2751,10 @@ ssl3_send_newsession_ticket(SSL *s) | |||
| 2751 | } else { | 2751 | } else { |
| 2752 | arc4random_buf(iv, 16); | 2752 | arc4random_buf(iv, 16); |
| 2753 | EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, | 2753 | EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, |
| 2754 | tctx->tlsext_tick_aes_key, iv); | 2754 | tctx->internal->tlsext_tick_aes_key, iv); |
| 2755 | HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16, | 2755 | HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key, |
| 2756 | tlsext_tick_md(), NULL); | 2756 | 16, tlsext_tick_md(), NULL); |
| 2757 | memcpy(key_name, tctx->tlsext_tick_key_name, 16); | 2757 | memcpy(key_name, tctx->internal->tlsext_tick_key_name, 16); |
| 2758 | } | 2758 | } |
| 2759 | 2759 | ||
| 2760 | /* | 2760 | /* |
