summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjca <>2018-03-03 19:58:29 +0000
committerjca <>2018-03-03 19:58:29 +0000
commitda5d3c3e9e3e6e4745c32fe969554470335a4abe (patch)
treef8737c8642e4b55fe1b626bf6668d2cddfbdddc9
parent893043b7af14ee6af7eee004b42062b2c049e457 (diff)
downloadopenbsd-da5d3c3e9e3e6e4745c32fe969554470335a4abe.tar.gz
openbsd-da5d3c3e9e3e6e4745c32fe969554470335a4abe.tar.bz2
openbsd-da5d3c3e9e3e6e4745c32fe969554470335a4abe.zip
Provide macro versions of SSL_CTX_set_min/max_proto_version and friends
Needed at least by openvpn-2.4.5, which detects availability of this interface using #ifdefs... Discussed with & ok jsing@
-rw-r--r--src/lib/libssl/ssl.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index d65e99363d..e6556fd136 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.145 2018/02/22 17:30:25 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.146 2018/03/03 19:58:29 jca 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 *
@@ -1200,6 +1200,21 @@ int SSL_set_max_proto_version(SSL *ssl, uint16_t version);
1200#define SSL_get_server_tmp_key(s, pk) \ 1200#define SSL_get_server_tmp_key(s, pk) \
1201 SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) 1201 SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk)
1202 1202
1203#ifndef LIBRESSL_INTERNAL
1204/*
1205 * Also provide those functions as macros for compatibility with
1206 * existing users.
1207 */
1208#define SSL_CTX_set1_groups SSL_CTX_set1_groups
1209#define SSL_CTX_set1_groups_list SSL_CTX_set1_groups_list
1210#define SSL_set1_groups SSL_set1_groups
1211#define SSL_set1_groups_list SSL_set1_groups_list
1212#define SSL_CTX_set_min_proto_version SSL_CTX_set_min_proto_version
1213#define SSL_CTX_set_max_proto_version SSL_CTX_set_max_proto_version
1214#define SSL_set_min_proto_version SSL_set_min_proto_version
1215#define SSL_set_max_proto_version SSL_set_max_proto_version
1216#endif
1217
1203BIO_METHOD *BIO_f_ssl(void); 1218BIO_METHOD *BIO_f_ssl(void);
1204BIO *BIO_new_ssl(SSL_CTX *ctx, int client); 1219BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
1205BIO *BIO_new_ssl_connect(SSL_CTX *ctx); 1220BIO *BIO_new_ssl_connect(SSL_CTX *ctx);