diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 72de5c15a9..0789b914b7 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.126 2017/01/31 15:35:46 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.127 2017/02/05 15:06:05 jsing 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 | * |
@@ -1120,6 +1120,9 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
1120 | #define SSL_CTRL_GET_EXTRA_CHAIN_CERTS 82 | 1120 | #define SSL_CTRL_GET_EXTRA_CHAIN_CERTS 82 |
1121 | #define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS 83 | 1121 | #define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS 83 |
1122 | 1122 | ||
1123 | #define SSL_CTRL_SET_GROUPS 91 | ||
1124 | #define SSL_CTRL_SET_GROUPS_LIST 92 | ||
1125 | |||
1123 | #define SSL_CTRL_SET_ECDH_AUTO 94 | 1126 | #define SSL_CTRL_SET_ECDH_AUTO 94 |
1124 | 1127 | ||
1125 | #define SSL_CTRL_GET_SERVER_TMP_KEY 109 | 1128 | #define SSL_CTRL_GET_SERVER_TMP_KEY 109 |
@@ -1175,19 +1178,8 @@ int SSL_set1_groups(SSL *ssl, const int *groups, size_t groups_len); | |||
1175 | int SSL_set1_groups_list(SSL *ssl, const char *groups); | 1178 | int SSL_set1_groups_list(SSL *ssl, const char *groups); |
1176 | 1179 | ||
1177 | #ifndef LIBRESSL_INTERNAL | 1180 | #ifndef LIBRESSL_INTERNAL |
1178 | /* | 1181 | #define SSL_CTRL_SET_CURVES SSL_CTRL_SET_GROUPS |
1179 | * Preprocessor compatibility section. | 1182 | #define SSL_CTRL_SET_CURVES_LIST SSL_CTRL_SET_GROUPS_LIST |
1180 | * | ||
1181 | * Historically, a number of APIs were implemented in OpenSSL as macros and | ||
1182 | * constants to 'ctrl' functions. To avoid breaking #ifdefs in consumers, this | ||
1183 | * section defines a number of legacy macros. | ||
1184 | * | ||
1185 | * Although using either the CTRL values or their wrapper macros in #ifdefs is | ||
1186 | * still supported, the CTRL values may not be passed to SSL_ctrl and | ||
1187 | * SSL_CTX_ctrl. Call the functions (previously wrapper macros) instead. | ||
1188 | */ | ||
1189 | #define SSL_CTRL_SET_CURVES doesnt_exist | ||
1190 | #define SSL_CTRL_SET_CURVES_LIST doesnt_exist | ||
1191 | 1183 | ||
1192 | #define SSL_CTX_set1_curves SSL_CTX_set1_groups | 1184 | #define SSL_CTX_set1_curves SSL_CTX_set1_groups |
1193 | #define SSL_CTX_set1_curves_list SSL_CTX_set1_groups_list | 1185 | #define SSL_CTX_set1_curves_list SSL_CTX_set1_groups_list |