diff options
author | tb <> | 2022-09-11 17:39:46 +0000 |
---|---|---|
committer | tb <> | 2022-09-11 17:39:46 +0000 |
commit | 2962d03be2298b7edb81b761341f82be7bd551d2 (patch) | |
tree | b11e9fb043a9ef8434a6b0a60a0a16dcd669354f | |
parent | 270c5b582a1b9ef637d38ef4514dbb51b93e4721 (diff) | |
download | openbsd-2962d03be2298b7edb81b761341f82be7bd551d2.tar.gz openbsd-2962d03be2298b7edb81b761341f82be7bd551d2.tar.bz2 openbsd-2962d03be2298b7edb81b761341f82be7bd551d2.zip |
Expose SSL_get_share_{group,curve}() and related #defines
ok jsing
-rw-r--r-- | src/lib/libssl/ssl.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 8195947a7e..4a89bfd868 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.228 2022/09/11 17:38:58 tb Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.229 2022/09/11 17:39:46 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 | * |
@@ -937,10 +937,8 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
937 | 937 | ||
938 | #define SSL_CTRL_SET_GROUPS 91 | 938 | #define SSL_CTRL_SET_GROUPS 91 |
939 | #define SSL_CTRL_SET_GROUPS_LIST 92 | 939 | #define SSL_CTRL_SET_GROUPS_LIST 92 |
940 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | 940 | #define SSL_CTRL_GET_SHARED_GROUP 93 |
941 | #define SSL_CTRL_GET_SHARED_GROUP 93 | 941 | #define SSL_CTRL_SET_ECDH_AUTO 94 |
942 | #endif | ||
943 | #define SSL_CTRL_SET_ECDH_AUTO 94 | ||
944 | 942 | ||
945 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 943 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
946 | #define SSL_CTRL_GET_PEER_SIGNATURE_NID 108 | 944 | #define SSL_CTRL_GET_PEER_SIGNATURE_NID 108 |
@@ -1056,11 +1054,9 @@ const SSL_METHOD *SSL_CTX_get_ssl_method(const SSL_CTX *ctx); | |||
1056 | #define SSL_CTX_clear_extra_chain_certs(ctx) \ | 1054 | #define SSL_CTX_clear_extra_chain_certs(ctx) \ |
1057 | SSL_CTX_ctrl(ctx, SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS, 0, NULL) | 1055 | SSL_CTX_ctrl(ctx, SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS, 0, NULL) |
1058 | 1056 | ||
1059 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
1060 | #define SSL_get_shared_group(s, n) \ | 1057 | #define SSL_get_shared_group(s, n) \ |
1061 | SSL_ctrl((s), SSL_CTRL_GET_SHARED_GROUP, (n), NULL) | 1058 | SSL_ctrl((s), SSL_CTRL_GET_SHARED_GROUP, (n), NULL) |
1062 | #define SSL_get_shared_curve SSL_get_shared_group | 1059 | #define SSL_get_shared_curve SSL_get_shared_group |
1063 | #endif | ||
1064 | 1060 | ||
1065 | #define SSL_get_server_tmp_key(s, pk) \ | 1061 | #define SSL_get_server_tmp_key(s, pk) \ |
1066 | SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) | 1062 | SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) |