From ac33351192e71b0017374753c08cd4b2eca48efd Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 11 Sep 2022 17:39:46 +0000 Subject: [PATCH] Expose SSL_get_share_{group,curve}() and related #defines ok jsing --- lib/libssl/ssl.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index 8195947a7e6..4a89bfd868c 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.228 2022/09/11 17:38:58 tb Exp $ */ +/* $OpenBSD: ssl.h,v 1.229 2022/09/11 17:39:46 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -937,10 +937,8 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); #define SSL_CTRL_SET_GROUPS 91 #define SSL_CTRL_SET_GROUPS_LIST 92 -#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) -#define SSL_CTRL_GET_SHARED_GROUP 93 -#endif -#define SSL_CTRL_SET_ECDH_AUTO 94 +#define SSL_CTRL_GET_SHARED_GROUP 93 +#define SSL_CTRL_SET_ECDH_AUTO 94 #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) #define SSL_CTRL_GET_PEER_SIGNATURE_NID 108 @@ -1056,11 +1054,9 @@ const SSL_METHOD *SSL_CTX_get_ssl_method(const SSL_CTX *ctx); #define SSL_CTX_clear_extra_chain_certs(ctx) \ SSL_CTX_ctrl(ctx, SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS, 0, NULL) -#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) #define SSL_get_shared_group(s, n) \ SSL_ctrl((s), SSL_CTRL_GET_SHARED_GROUP, (n), NULL) #define SSL_get_shared_curve SSL_get_shared_group -#endif #define SSL_get_server_tmp_key(s, pk) \ SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) -- 2.20.1