summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-01-25 03:20:27 +0000
committerjsing <jsing@openbsd.org>2017-01-25 03:20:27 +0000
commit1fbdfa1657efd56a01f574e3bf90082987b58586 (patch)
treef738c834c2ff8defbf2d2a9f2e3b2c77cb0c8690 /lib/libssl/ssl.h
parent+arm64 (diff)
downloadwireguard-openbsd-1fbdfa1657efd56a01f574e3bf90082987b58586.tar.xz
wireguard-openbsd-1fbdfa1657efd56a01f574e3bf90082987b58586.zip
Provide defines for SSL_CTRL_SET_CURVES/SSL_CTRL_SET_CURVES_LIST for things
that are conditioning on these. From BoringSSL. ok beck@
Diffstat (limited to 'lib/libssl/ssl.h')
-rw-r--r--lib/libssl/ssl.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index cf75130faf7..8824d2e0f61 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.122 2017/01/24 09:03:21 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.123 2017/01/25 03:20:27 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1176,6 +1176,20 @@ int SSL_set1_groups(SSL *ssl, const int *groups, size_t groups_len);
int SSL_set1_groups_list(SSL *ssl, const char *groups);
#ifndef LIBRESSL_INTERNAL
+/*
+ * Preprocessor compatibility section.
+ *
+ * Historically, a number of APIs were implemented in OpenSSL as macros and
+ * constants to 'ctrl' functions. To avoid breaking #ifdefs in consumers, this
+ * section defines a number of legacy macros.
+ *
+ * Although using either the CTRL values or their wrapper macros in #ifdefs is
+ * still supported, the CTRL values may not be passed to SSL_ctrl and
+ * SSL_CTX_ctrl. Call the functions (previously wrapper macros) instead.
+ */
+#define SSL_CTRL_SET_CURVES doesnt_exist
+#define SSL_CTRL_SET_CURVES_LIST doesnt_exist
+
#define SSL_CTX_set1_curves SSL_CTX_set1_groups
#define SSL_CTX_set1_curves_list SSL_CTX_set1_groups_list
#define SSL_set1_curves SSL_set1_groups