diff options
author | jsing <> | 2021-03-29 16:46:09 +0000 |
---|---|---|
committer | jsing <> | 2021-03-29 16:46:09 +0000 |
commit | ffd3a25f2822ad41040600e98da045f9f9ca96dd (patch) | |
tree | 8a97f354c4119a96736fdf5834563fa25bf10bf4 /src/lib/libssl/ssl_pkt.c | |
parent | f431352ee52eb3d8093a86cdc439cd6faf807ca7 (diff) | |
download | openbsd-ffd3a25f2822ad41040600e98da045f9f9ca96dd.tar.gz openbsd-ffd3a25f2822ad41040600e98da045f9f9ca96dd.tar.bz2 openbsd-ffd3a25f2822ad41040600e98da045f9f9ca96dd.zip |
Move finished and peer finished to the handshake struct.
This moves the finish_md and peer_finish_md from the 'tmp' struct to the
handshake struct, renaming to finished and peer_finished in the process.
This also allows the remaining S3I(s) references to be removed from the
TLSv1.3 client and server.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_pkt.c')
-rw-r--r-- | src/lib/libssl/ssl_pkt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c index a93acdfa7f..a760f90a3a 100644 --- a/src/lib/libssl/ssl_pkt.c +++ b/src/lib/libssl/ssl_pkt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_pkt.c,v 1.39 2021/03/24 18:44:00 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_pkt.c,v 1.40 2021/03/29 16:46:09 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 | * |
@@ -1190,12 +1190,12 @@ ssl3_do_change_cipher_spec(SSL *s) | |||
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | i = tls1_final_finish_mac(s, sender, slen, | 1192 | i = tls1_final_finish_mac(s, sender, slen, |
1193 | S3I(s)->tmp.peer_finish_md); | 1193 | S3I(s)->hs.peer_finished); |
1194 | if (i == 0) { | 1194 | if (i == 0) { |
1195 | SSLerror(s, ERR_R_INTERNAL_ERROR); | 1195 | SSLerror(s, ERR_R_INTERNAL_ERROR); |
1196 | return 0; | 1196 | return 0; |
1197 | } | 1197 | } |
1198 | S3I(s)->tmp.peer_finish_md_len = i; | 1198 | S3I(s)->hs.peer_finished_len = i; |
1199 | 1199 | ||
1200 | return (1); | 1200 | return (1); |
1201 | } | 1201 | } |