summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <>2022-01-05 17:10:03 +0000
committerjsing <>2022-01-05 17:10:03 +0000
commit767ff39662be70f355eac7cf069fd9c23c34580d (patch)
treebf1d8f80a603da1e77e6fec1a2697b878680932b /src/lib/libssl/ssl_locl.h
parent2a4d455b5a48685d7473bacd6643c5f7fdfbe18a (diff)
downloadopenbsd-767ff39662be70f355eac7cf069fd9c23c34580d.tar.gz
openbsd-767ff39662be70f355eac7cf069fd9c23c34580d.tar.bz2
openbsd-767ff39662be70f355eac7cf069fd9c23c34580d.zip
Rename tls13_key_share to tls_key_share.
In preparation to use the key share code in both the TLSv1.3 and legacy stacks, rename tls13_key_share to tls_key_share, moving it into the shared handshake struct. Further changes will then allow the legacy stack to make use of the same code for ephemeral key exchange. ok inoguchi@ tb@
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl_locl.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index d53c9ec273..d6d20c2ceb 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.372 2021/12/04 14:03:22 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.373 2022/01/05 17:10: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 *
@@ -539,7 +539,6 @@ typedef struct ssl_handshake_tls13_st {
539 uint16_t server_version; 539 uint16_t server_version;
540 540
541 uint16_t server_group; 541 uint16_t server_group;
542 struct tls13_key_share *key_share;
543 struct tls13_secrets *secrets; 542 struct tls13_secrets *secrets;
544 543
545 uint8_t *cookie; 544 uint8_t *cookie;
@@ -605,6 +604,9 @@ typedef struct ssl_handshake_st {
605 uint8_t *sigalgs; 604 uint8_t *sigalgs;
606 size_t sigalgs_len; 605 size_t sigalgs_len;
607 606
607 /* Key share for ephemeral key exchange. */
608 struct tls_key_share *key_share;
609
608 /* 610 /*
609 * Copies of the verify data sent in our finished message and the 611 * Copies of the verify data sent in our finished message and the
610 * verify data received in the finished message sent by our peer. 612 * verify data received in the finished message sent by our peer.