diff options
author | jsing <> | 2017-05-06 20:37:25 +0000 |
---|---|---|
committer | jsing <> | 2017-05-06 20:37:25 +0000 |
commit | 792684dc457d44526f35586cb1671d67604bf5b1 (patch) | |
tree | 93525fc35ada38404416d83084837f1f94d46be3 /src/lib/libssl/s3_lib.c | |
parent | 93ad7dce844283fb07b0d09b99999f2f71b47bd5 (diff) | |
download | openbsd-792684dc457d44526f35586cb1671d67604bf5b1.tar.gz openbsd-792684dc457d44526f35586cb1671d67604bf5b1.tar.bz2 openbsd-792684dc457d44526f35586cb1671d67604bf5b1.zip |
Provide SSL{,_CTX}_set_{min,max}_proto_version() functions.
Rides minor bump.
ok beck@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index d4142e743f..0f05b8f2fe 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.140 2017/04/10 17:27:33 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.141 2017/05/06 20:37:24 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 | * |
@@ -2141,6 +2141,16 @@ ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) | |||
2141 | ret = ssl_ctrl_get_server_tmp_key(s, parg); | 2141 | ret = ssl_ctrl_get_server_tmp_key(s, parg); |
2142 | break; | 2142 | break; |
2143 | 2143 | ||
2144 | case SSL_CTRL_SET_MIN_PROTO_VERSION: | ||
2145 | if (larg < 0 || larg > UINT16_MAX) | ||
2146 | return (0); | ||
2147 | return SSL_set_min_proto_version(s, larg); | ||
2148 | |||
2149 | case SSL_CTRL_SET_MAX_PROTO_VERSION: | ||
2150 | if (larg < 0 || larg > UINT16_MAX) | ||
2151 | return (0); | ||
2152 | return SSL_set_max_proto_version(s, larg); | ||
2153 | |||
2144 | default: | 2154 | default: |
2145 | break; | 2155 | break; |
2146 | } | 2156 | } |
@@ -2323,6 +2333,16 @@ ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) | |||
2323 | case SSL_CTRL_SET_GROUPS_LIST: | 2333 | case SSL_CTRL_SET_GROUPS_LIST: |
2324 | return SSL_CTX_set1_groups_list(ctx, parg); | 2334 | return SSL_CTX_set1_groups_list(ctx, parg); |
2325 | 2335 | ||
2336 | case SSL_CTRL_SET_MIN_PROTO_VERSION: | ||
2337 | if (larg < 0 || larg > UINT16_MAX) | ||
2338 | return (0); | ||
2339 | return SSL_CTX_set_min_proto_version(ctx, larg); | ||
2340 | |||
2341 | case SSL_CTRL_SET_MAX_PROTO_VERSION: | ||
2342 | if (larg < 0 || larg > UINT16_MAX) | ||
2343 | return (0); | ||
2344 | return SSL_CTX_set_max_proto_version(ctx, larg); | ||
2345 | |||
2326 | default: | 2346 | default: |
2327 | return (0); | 2347 | return (0); |
2328 | } | 2348 | } |