diff options
| author | jsing <> | 2017-05-06 20:37:25 +0000 |
|---|---|---|
| committer | jsing <> | 2017-05-06 20:37:25 +0000 |
| commit | 0869d93fa2822cd7c9118eab9c9868d0d91ba3d7 (patch) | |
| tree | 93525fc35ada38404416d83084837f1f94d46be3 /src/lib/libssl/ssl.h | |
| parent | 850f97a57e4dd087f849a5ab8913e6ea9e4788cf (diff) | |
| download | openbsd-0869d93fa2822cd7c9118eab9c9868d0d91ba3d7.tar.gz openbsd-0869d93fa2822cd7c9118eab9c9868d0d91ba3d7.tar.bz2 openbsd-0869d93fa2822cd7c9118eab9c9868d0d91ba3d7.zip | |
Provide SSL{,_CTX}_set_{min,max}_proto_version() functions.
Rides minor bump.
ok beck@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 0789b914b7..05d0660c49 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.127 2017/02/05 15:06:05 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.128 2017/05/06 20:37:25 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 | * |
| @@ -1129,6 +1129,9 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
| 1129 | 1129 | ||
| 1130 | #define SSL_CTRL_SET_DH_AUTO 118 | 1130 | #define SSL_CTRL_SET_DH_AUTO 118 |
| 1131 | 1131 | ||
| 1132 | #define SSL_CTRL_SET_MIN_PROTO_VERSION 123 | ||
| 1133 | #define SSL_CTRL_SET_MAX_PROTO_VERSION 124 | ||
| 1134 | |||
| 1132 | #define DTLSv1_get_timeout(ssl, arg) \ | 1135 | #define DTLSv1_get_timeout(ssl, arg) \ |
| 1133 | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) | 1136 | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) |
| 1134 | #define DTLSv1_handle_timeout(ssl) \ | 1137 | #define DTLSv1_handle_timeout(ssl) \ |
| @@ -1177,6 +1180,12 @@ int SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups); | |||
| 1177 | int SSL_set1_groups(SSL *ssl, const int *groups, size_t groups_len); | 1180 | int SSL_set1_groups(SSL *ssl, const int *groups, size_t groups_len); |
| 1178 | int SSL_set1_groups_list(SSL *ssl, const char *groups); | 1181 | int SSL_set1_groups_list(SSL *ssl, const char *groups); |
| 1179 | 1182 | ||
| 1183 | int SSL_CTX_set_min_proto_version(SSL_CTX *ctx, uint16_t version); | ||
| 1184 | int SSL_CTX_set_max_proto_version(SSL_CTX *ctx, uint16_t version); | ||
| 1185 | |||
| 1186 | int SSL_set_min_proto_version(SSL *ssl, uint16_t version); | ||
| 1187 | int SSL_set_max_proto_version(SSL *ssl, uint16_t version); | ||
| 1188 | |||
| 1180 | #ifndef LIBRESSL_INTERNAL | 1189 | #ifndef LIBRESSL_INTERNAL |
| 1181 | #define SSL_CTRL_SET_CURVES SSL_CTRL_SET_GROUPS | 1190 | #define SSL_CTRL_SET_CURVES SSL_CTRL_SET_GROUPS |
| 1182 | #define SSL_CTRL_SET_CURVES_LIST SSL_CTRL_SET_GROUPS_LIST | 1191 | #define SSL_CTRL_SET_CURVES_LIST SSL_CTRL_SET_GROUPS_LIST |
