diff options
author | tb <> | 2022-08-17 18:43:17 +0000 |
---|---|---|
committer | tb <> | 2022-08-17 18:43:17 +0000 |
commit | 1629543e9a637d8ec02b2ab4fb5c737c5e968941 (patch) | |
tree | 50c446c9b6baa38bd023052a162efab5decb09bc /src | |
parent | 3b24f4e297f55d1eb2e648159655e668002be974 (diff) | |
download | openbsd-1629543e9a637d8ec02b2ab4fb5c737c5e968941.tar.gz openbsd-1629543e9a637d8ec02b2ab4fb5c737c5e968941.tar.bz2 openbsd-1629543e9a637d8ec02b2ab4fb5c737c5e968941.zip |
Add SSL_get_shared_{curve,group}()
These are wrappers of SSL_ctrl() using the SSL_CTRL_GET_SHARED_GROUP
control. Do not provide SSL_CTRL_GET_SHARED_CURVE since that is only
mentioned in Net::SSLeay docs according to codesearch.debian.net.
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/ssl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 14fb094e71..e649a6972e 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.222 2022/07/24 14:16:29 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.223 2022/08/17 18:43:17 tb 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 | * |
@@ -930,7 +930,9 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
930 | 930 | ||
931 | #define SSL_CTRL_SET_GROUPS 91 | 931 | #define SSL_CTRL_SET_GROUPS 91 |
932 | #define SSL_CTRL_SET_GROUPS_LIST 92 | 932 | #define SSL_CTRL_SET_GROUPS_LIST 92 |
933 | 933 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | |
934 | #define SSL_CTRL_GET_SHARED_GROUP 93 | ||
935 | #endif | ||
934 | #define SSL_CTRL_SET_ECDH_AUTO 94 | 936 | #define SSL_CTRL_SET_ECDH_AUTO 94 |
935 | 937 | ||
936 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 938 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
@@ -1047,6 +1049,12 @@ const SSL_METHOD *SSL_CTX_get_ssl_method(const SSL_CTX *ctx); | |||
1047 | #define SSL_CTX_clear_extra_chain_certs(ctx) \ | 1049 | #define SSL_CTX_clear_extra_chain_certs(ctx) \ |
1048 | SSL_CTX_ctrl(ctx, SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS, 0, NULL) | 1050 | SSL_CTX_ctrl(ctx, SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS, 0, NULL) |
1049 | 1051 | ||
1052 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
1053 | #define SSL_get_shared_group(s, n) \ | ||
1054 | SSL_ctrl((s), SSL_CTRL_GET_SHARED_GROUP, (n), NULL) | ||
1055 | #define SSL_get_shared_curve SSL_get_shared_group | ||
1056 | #endif | ||
1057 | |||
1050 | #define SSL_get_server_tmp_key(s, pk) \ | 1058 | #define SSL_get_server_tmp_key(s, pk) \ |
1051 | SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) | 1059 | SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) |
1052 | 1060 | ||