diff options
| author | jsing <> | 2021-01-07 15:32:59 +0000 |
|---|---|---|
| committer | jsing <> | 2021-01-07 15:32:59 +0000 |
| commit | 52bc4cc7db12364bbcb839a24b7abbdde6aa098d (patch) | |
| tree | d58094850feafb23ea66396721d16b400c034196 /src/lib/libssl/ssl_both.c | |
| parent | 8c6ed1c8cf7a5d3ab7f23f2c6f3f95b345d4f5c4 (diff) | |
| download | openbsd-52bc4cc7db12364bbcb839a24b7abbdde6aa098d.tar.gz openbsd-52bc4cc7db12364bbcb839a24b7abbdde6aa098d.tar.bz2 openbsd-52bc4cc7db12364bbcb839a24b7abbdde6aa098d.zip | |
Move the read MAC key into the TLSv1.2 record layer.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_both.c')
| -rw-r--r-- | src/lib/libssl/ssl_both.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index 6480b45bec..ee69f9a121 100644 --- a/src/lib/libssl/ssl_both.c +++ b/src/lib/libssl/ssl_both.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_both.c,v 1.22 2021/01/05 17:14:46 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.23 2021/01/07 15:32:59 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 | * |
| @@ -301,13 +301,6 @@ f_err: | |||
| 301 | return (0); | 301 | return (0); |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | /* for these 2 messages, we need to | ||
| 305 | * ssl->enc_read_ctx re-init | ||
| 306 | * ssl->s3->internal->read_sequence zero | ||
| 307 | * ssl->s3->internal->read_mac_secret re-init | ||
| 308 | * ssl->session->read_sym_enc assign | ||
| 309 | * ssl->session->read_hash assign | ||
| 310 | */ | ||
| 311 | int | 304 | int |
| 312 | ssl3_send_change_cipher_spec(SSL *s, int a, int b) | 305 | ssl3_send_change_cipher_spec(SSL *s, int a, int b) |
| 313 | { | 306 | { |
