diff options
| author | Matt Caswell <matt@openssl.org> | 2015-05-15 10:42:08 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-05-22 10:38:37 +0200 |
| commit | a7f82a1ab2be0b9c27944430ac48ad63cc0d5e79 (patch) | |
| tree | 5d6c31fd073c0e141f09904736122e7ea6c4b1d8 /apps/s_server.c | |
| parent | Fix a memory leak in compression (diff) | |
| download | openssl-a7f82a1ab2be0b9c27944430ac48ad63cc0d5e79.tar.xz openssl-a7f82a1ab2be0b9c27944430ac48ad63cc0d5e79.zip | |
Fix various OPENSSL_NO_* options
This fixes compilation with various OPENSSL_NO_* options that got broken
during the big apps cleanup.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index e46376db4c..5500ceadbc 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -997,7 +997,10 @@ int s_server_main(int argc, char *argv[]) char *CApath = NULL, *CAfile = NULL, *chCApath = NULL, *chCAfile = NULL; char *dhfile = NULL, *dpassarg = NULL, *dpass = NULL, *inrand = NULL; char *passarg = NULL, *pass = NULL, *vfyCApath = NULL, *vfyCAfile = NULL; - char *crl_file = NULL, *prog, *p; + char *crl_file = NULL, *prog; +#ifndef OPENSSL_NO_PSK + char *p; +#endif const char *unix_path = NULL; #ifndef NO_SYS_UN_H int unlink_unix_path = 0; @@ -1046,6 +1049,18 @@ int s_server_main(int argc, char *argv[]) prog = opt_init(argc, argv, s_server_options); while ((o = opt_next()) != OPT_EOF) { switch (o) { +#ifdef OPENSSL_NO_PSK + case OPT_PSK_HINT: + case OPT_PSK: +#endif +#ifdef OPENSSL_NO_DTLS1 + case OPT_DTLS: + case OPT_DTLS1: + case OPT_DTLS1_2: + case OPT_TIMEOUT: + case OPT_MTU: + case OPT_CHAIN: +#endif case OPT_EOF: case OPT_ERR: opthelp: |