summaryrefslogtreecommitdiffstats
path: root/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-05-06 20:37:24 +0000
committerjsing <jsing@openbsd.org>2017-05-06 20:37:24 +0000
commit43a30d3dc540bddabcfa9b4f1a82156efd0c91e4 (patch)
tree51583cc8f5f26a68679923819d55a05432540628 /lib/libssl/s3_lib.c
parentConvert explicit_bzero() + free() to freezero(). (diff)
downloadwireguard-openbsd-43a30d3dc540bddabcfa9b4f1a82156efd0c91e4.tar.xz
wireguard-openbsd-43a30d3dc540bddabcfa9b4f1a82156efd0c91e4.zip
Provide SSL{,_CTX}_set_{min,max}_proto_version() functions.
Rides minor bump. ok beck@
Diffstat (limited to 'lib/libssl/s3_lib.c')
-rw-r--r--lib/libssl/s3_lib.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c
index d4142e743fc..0f05b8f2fe8 100644
--- a/lib/libssl/s3_lib.c
+++ b/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.140 2017/04/10 17:27:33 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.141 2017/05/06 20:37:24 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -2141,6 +2141,16 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
ret = ssl_ctrl_get_server_tmp_key(s, parg);
break;
+ case SSL_CTRL_SET_MIN_PROTO_VERSION:
+ if (larg < 0 || larg > UINT16_MAX)
+ return (0);
+ return SSL_set_min_proto_version(s, larg);
+
+ case SSL_CTRL_SET_MAX_PROTO_VERSION:
+ if (larg < 0 || larg > UINT16_MAX)
+ return (0);
+ return SSL_set_max_proto_version(s, larg);
+
default:
break;
}
@@ -2323,6 +2333,16 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
case SSL_CTRL_SET_GROUPS_LIST:
return SSL_CTX_set1_groups_list(ctx, parg);
+ case SSL_CTRL_SET_MIN_PROTO_VERSION:
+ if (larg < 0 || larg > UINT16_MAX)
+ return (0);
+ return SSL_CTX_set_min_proto_version(ctx, larg);
+
+ case SSL_CTRL_SET_MAX_PROTO_VERSION:
+ if (larg < 0 || larg > UINT16_MAX)
+ return (0);
+ return SSL_CTX_set_max_proto_version(ctx, larg);
+
default:
return (0);
}