diff options
| author | jca <> | 2018-03-15 12:27:01 +0000 |
|---|---|---|
| committer | jca <> | 2018-03-15 12:27:01 +0000 |
| commit | 31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204 (patch) | |
| tree | e59ff43ff5a8063f6f2c91ce72b8d8fd4f30e897 /src/lib/libssl/ssl.h | |
| parent | 302371947c6242ab9f7f993a57b4b413756adb5c (diff) | |
| download | openbsd-31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204.tar.gz openbsd-31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204.tar.bz2 openbsd-31b9fe82ec87b1b7aac99b7c06baa2f6f85f1204.zip | |
Provide SSL_CTX_get_min_proto_version and SSL_CTX_get_max_proto_version
We already provided the setters, so also provide the getters like
OpenSSL does. Addition prompted by the use of those functions in recent
openvpn releases.
manpage diff from schwarze@ (thanks!) with input from jsing@, ok tb@
jsing@
Diffstat (limited to 'src/lib/libssl/ssl.h')
| -rw-r--r-- | src/lib/libssl/ssl.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index e6556fd136..5f9d248ced 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.146 2018/03/03 19:58:29 jca Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.147 2018/03/15 12:27:01 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 | * |
| @@ -1125,6 +1125,8 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
| 1125 | 1125 | ||
| 1126 | #define SSL_CTRL_SET_MIN_PROTO_VERSION 123 | 1126 | #define SSL_CTRL_SET_MIN_PROTO_VERSION 123 |
| 1127 | #define SSL_CTRL_SET_MAX_PROTO_VERSION 124 | 1127 | #define SSL_CTRL_SET_MAX_PROTO_VERSION 124 |
| 1128 | #define SSL_CTRL_GET_MIN_PROTO_VERSION 130 | ||
| 1129 | #define SSL_CTRL_GET_MAX_PROTO_VERSION 131 | ||
| 1128 | 1130 | ||
| 1129 | #define DTLSv1_get_timeout(ssl, arg) \ | 1131 | #define DTLSv1_get_timeout(ssl, arg) \ |
| 1130 | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) | 1132 | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) |
| @@ -1174,9 +1176,13 @@ int SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups); | |||
| 1174 | int SSL_set1_groups(SSL *ssl, const int *groups, size_t groups_len); | 1176 | int SSL_set1_groups(SSL *ssl, const int *groups, size_t groups_len); |
| 1175 | int SSL_set1_groups_list(SSL *ssl, const char *groups); | 1177 | int SSL_set1_groups_list(SSL *ssl, const char *groups); |
| 1176 | 1178 | ||
| 1179 | int SSL_CTX_get_min_proto_version(SSL_CTX *ctx); | ||
| 1180 | int SSL_CTX_get_max_proto_version(SSL_CTX *ctx); | ||
| 1177 | int SSL_CTX_set_min_proto_version(SSL_CTX *ctx, uint16_t version); | 1181 | int SSL_CTX_set_min_proto_version(SSL_CTX *ctx, uint16_t version); |
| 1178 | int SSL_CTX_set_max_proto_version(SSL_CTX *ctx, uint16_t version); | 1182 | int SSL_CTX_set_max_proto_version(SSL_CTX *ctx, uint16_t version); |
| 1179 | 1183 | ||
| 1184 | int SSL_get_min_proto_version(SSL *ssl); | ||
| 1185 | int SSL_get_max_proto_version(SSL *ssl); | ||
| 1180 | int SSL_set_min_proto_version(SSL *ssl, uint16_t version); | 1186 | int SSL_set_min_proto_version(SSL *ssl, uint16_t version); |
| 1181 | int SSL_set_max_proto_version(SSL *ssl, uint16_t version); | 1187 | int SSL_set_max_proto_version(SSL *ssl, uint16_t version); |
| 1182 | 1188 | ||
| @@ -1209,8 +1215,12 @@ int SSL_set_max_proto_version(SSL *ssl, uint16_t version); | |||
| 1209 | #define SSL_CTX_set1_groups_list SSL_CTX_set1_groups_list | 1215 | #define SSL_CTX_set1_groups_list SSL_CTX_set1_groups_list |
| 1210 | #define SSL_set1_groups SSL_set1_groups | 1216 | #define SSL_set1_groups SSL_set1_groups |
| 1211 | #define SSL_set1_groups_list SSL_set1_groups_list | 1217 | #define SSL_set1_groups_list SSL_set1_groups_list |
| 1218 | #define SSL_CTX_get_min_proto_version SSL_CTX_get_min_proto_version | ||
| 1219 | #define SSL_CTX_get_max_proto_version SSL_CTX_get_max_proto_version | ||
| 1212 | #define SSL_CTX_set_min_proto_version SSL_CTX_set_min_proto_version | 1220 | #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 | 1221 | #define SSL_CTX_set_max_proto_version SSL_CTX_set_max_proto_version |
| 1222 | #define SSL_get_min_proto_version SSL_get_min_proto_version | ||
| 1223 | #define SSL_get_max_proto_version SSL_get_max_proto_version | ||
| 1214 | #define SSL_set_min_proto_version SSL_set_min_proto_version | 1224 | #define SSL_set_min_proto_version SSL_set_min_proto_version |
| 1215 | #define SSL_set_max_proto_version SSL_set_max_proto_version | 1225 | #define SSL_set_max_proto_version SSL_set_max_proto_version |
| 1216 | #endif | 1226 | #endif |
