diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-03-19 07:46:10 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-03-19 18:24:30 +0100 |
| commit | 43110de041b77aef08bf744cba9330969895a321 (patch) | |
| tree | e0a800a9fa8e78a7bb4338ae3d725cdb093e16b3 /apps | |
| parent | Fix no-ec (diff) | |
| download | openssl-43110de041b77aef08bf744cba9330969895a321.tar.xz openssl-43110de041b77aef08bf744cba9330969895a321.zip | |
Support "-min_protocol" and "-max_protocol" in s_server and s_client
If for nothing else, they are needed when doing a regression test
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5663)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/apps.h b/apps/apps.h index 8f2590e5c8..4d4aae79ed 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -231,6 +231,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, OPT_S_STRICT, OPT_S_SIGALGS, OPT_S_CLIENTSIGALGS, OPT_S_GROUPS, \ OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, OPT_S_CIPHERSUITES, \ OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP, \ + OPT_S_MINPROTO, OPT_S_MAXPROTO, \ OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S__LAST # define OPT_S_OPTIONS \ @@ -274,6 +275,8 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, "Elliptic curve used for ECDHE (server-side only)" }, \ {"cipher", OPT_S_CIPHER, 's', "Specify TLSv1.2 and below cipher list to be used"}, \ {"ciphersuites", OPT_S_CIPHERSUITES, 's', "Specify TLSv1.3 ciphersuites to be used"}, \ + {"min_protocol", OPT_S_MINPROTO, 's', "Specify the minimum protocol version to be used"}, \ + {"max_protocol", OPT_S_MAXPROTO, 's', "Specify the maximum protocol version to be used"}, \ {"record_padding", OPT_S_RECORD_PADDING, 's', \ "Block size to pad TLS 1.3 records to."}, \ {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \ @@ -309,6 +312,8 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, case OPT_S_CIPHERSUITES: \ case OPT_S_RECORD_PADDING: \ case OPT_S_NO_RENEGOTIATION: \ + case OPT_S_MINPROTO: \ + case OPT_S_MAXPROTO: \ case OPT_S_DEBUGBROKE: \ case OPT_S_NO_MIDDLEBOX |