diff options
author | jsing <> | 2022-01-06 18:23:56 +0000 |
---|---|---|
committer | jsing <> | 2022-01-06 18:23:56 +0000 |
commit | 8aaae3574818dcc48e518588a5f21f25567c50f6 (patch) | |
tree | 576e268ac740ee1d976432ed20601d429a60115e /src/lib/libssl/ssl_locl.h | |
parent | 58c29787c787c30889a5c9cdee9a109dfb201177 (diff) | |
download | openbsd-8aaae3574818dcc48e518588a5f21f25567c50f6.tar.gz openbsd-8aaae3574818dcc48e518588a5f21f25567c50f6.tar.bz2 openbsd-8aaae3574818dcc48e518588a5f21f25567c50f6.zip |
Convert legacy TLS client to tls_key_share.
This requires adding DHE support to tls_key_share. In doing so,
tls_key_share_peer_public() has to lose the group argument and gains
an invalid_key argument. The one place that actually needs the group
check is tlsext_keyshare_client_parse(), so add code to do this.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index d6d20c2ceb..83b40d2dd3 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.373 2022/01/05 17:10:02 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.374 2022/01/06 18:23:56 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 | * |
@@ -1242,11 +1242,6 @@ typedef struct sess_cert_st { | |||
1242 | /* Obviously we don't have the private keys of these, | 1242 | /* Obviously we don't have the private keys of these, |
1243 | * so maybe we shouldn't even use the CERT_PKEY type here. */ | 1243 | * so maybe we shouldn't even use the CERT_PKEY type here. */ |
1244 | 1244 | ||
1245 | int peer_nid; | ||
1246 | DH *peer_dh_tmp; | ||
1247 | EC_KEY *peer_ecdh_tmp; | ||
1248 | uint8_t *peer_x25519_tmp; | ||
1249 | |||
1250 | int references; /* actually always 1 at the moment */ | 1245 | int references; /* actually always 1 at the moment */ |
1251 | } SESS_CERT; | 1246 | } SESS_CERT; |
1252 | 1247 | ||