diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-11-28 22:12:58 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-12-15 11:47:17 +0100 |
| commit | 021410ea3fc3876538830839d16b67e610d12785 (patch) | |
| tree | 7178c87097f1083bc285a77f8ec179ceba343464 /apps/s_server.c | |
| parent | test: document the random test ordering env variable (diff) | |
| download | openssl-021410ea3fc3876538830839d16b67e610d12785.tar.xz openssl-021410ea3fc3876538830839d16b67e610d12785.zip | |
Check non-option arguments
Make sure all commands check to see if there are any "extra" arguments
after the options, and print an error if so.
Made all error messages consistent (which is to say, minimal).
Fixes: #13527
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13563)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 24dffeab01..55a300beac 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1660,8 +1660,11 @@ int s_server_main(int argc, char *argv[]) break; } } + + /* No extra arguments. */ argc = opt_num_rest(); - argv = opt_rest(); + if (argc != 0) + goto opthelp; #ifndef OPENSSL_NO_NEXTPROTONEG if (min_version == TLS1_3_VERSION && next_proto_neg_in != NULL) { |