summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authorjca <>2018-03-15 12:27:01 +0000
committerjca <>2018-03-15 12:27:01 +0000
commit2622410ed251447b1fabb360b33d023a95414339 (patch)
treee59ff43ff5a8063f6f2c91ce72b8d8fd4f30e897 /src/lib/libssl/s3_lib.c
parent465530f1caa501bb0fc3b1adcc54d810ee97b096 (diff)
downloadopenbsd-2622410ed251447b1fabb360b33d023a95414339.tar.gz
openbsd-2622410ed251447b1fabb360b33d023a95414339.tar.bz2
openbsd-2622410ed251447b1fabb360b33d023a95414339.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/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 8f75cf9498..52e0c52410 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_lib.c,v 1.164 2018/02/17 15:08:21 jsing Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.165 2018/03/15 12:27:00 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 *
@@ -1984,6 +1984,12 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
1984 case SSL_CTRL_GET_SERVER_TMP_KEY: 1984 case SSL_CTRL_GET_SERVER_TMP_KEY:
1985 return ssl_ctrl_get_server_tmp_key(s, parg); 1985 return ssl_ctrl_get_server_tmp_key(s, parg);
1986 1986
1987 case SSL_CTRL_GET_MIN_PROTO_VERSION:
1988 return SSL_get_min_proto_version(s);
1989
1990 case SSL_CTRL_GET_MAX_PROTO_VERSION:
1991 return SSL_get_max_proto_version(s);
1992
1987 case SSL_CTRL_SET_MIN_PROTO_VERSION: 1993 case SSL_CTRL_SET_MIN_PROTO_VERSION:
1988 if (larg < 0 || larg > UINT16_MAX) 1994 if (larg < 0 || larg > UINT16_MAX)
1989 return 0; 1995 return 0;
@@ -2243,6 +2249,12 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
2243 case SSL_CTRL_SET_GROUPS_LIST: 2249 case SSL_CTRL_SET_GROUPS_LIST:
2244 return SSL_CTX_set1_groups_list(ctx, parg); 2250 return SSL_CTX_set1_groups_list(ctx, parg);
2245 2251
2252 case SSL_CTRL_GET_MIN_PROTO_VERSION:
2253 return SSL_CTX_get_min_proto_version(ctx);
2254
2255 case SSL_CTRL_GET_MAX_PROTO_VERSION:
2256 return SSL_CTX_get_max_proto_version(ctx);
2257
2246 case SSL_CTRL_SET_MIN_PROTO_VERSION: 2258 case SSL_CTRL_SET_MIN_PROTO_VERSION:
2247 if (larg < 0 || larg > UINT16_MAX) 2259 if (larg < 0 || larg > UINT16_MAX)
2248 return 0; 2260 return 0;