diff options
| author | Matt Caswell <matt@openssl.org> | 2015-05-15 09:42:08 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-05-22 09:38:37 +0100 |
| commit | a7f82a1ab2be0b9c27944430ac48ad63cc0d5e79 (patch) | |
| tree | 5d6c31fd073c0e141f09904736122e7ea6c4b1d8 | |
| parent | 6b41b3f5eacc6b1bb851c9dce22d6e893f32ea7d (diff) | |
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>
| -rw-r--r-- | apps/s_client.c | 14 | ||||
| -rw-r--r-- | apps/s_server.c | 17 | ||||
| -rw-r--r-- | apps/srp.c | 21 |
3 files changed, 40 insertions, 12 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 339e4517db..9717ad131c 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -722,6 +722,20 @@ int s_client_main(int argc, char **argv) #ifdef OPENSSL_NO_SSL_TRACE case OPT_TRACE: #endif +#ifdef OPENSSL_NO_PSK + case OPT_PSK_IDENTITY: + case OPT_PSK: +#endif +#ifdef OPENSSL_NO_SSL3 + case OPT_SSL3: +#endif +#ifdef OPENSSL_NO_DTLS1 + case OPT_DTLS: + case OPT_DTLS1: + case OPT_DTLS1_2: + case OPT_TIMEOUT: + case OPT_MTU: +#endif case OPT_EOF: case OPT_ERR: opthelp: 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: diff --git a/apps/srp.c b/apps/srp.c index 6c50a6e6d7..161f2b89ef 100644 --- a/apps/srp.c +++ b/apps/srp.c @@ -58,17 +58,16 @@ #include <openssl/opensslconf.h> #ifndef OPENSSL_NO_SRP -# include <stdio.h> -# include <stdlib.h> -# include <string.h> -# include <openssl/conf.h> -# include <openssl/bio.h> -# include <openssl/err.h> -# include <openssl/txt_db.h> -# include <openssl/buffer.h> -# include <openssl/srp.h> - -# include "apps.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <openssl/conf.h> +#include <openssl/bio.h> +#include <openssl/err.h> +#include <openssl/txt_db.h> +#include <openssl/buffer.h> +#include <openssl/srp.h> +#include "apps.h" # define BASE_SECTION "srp" # define CONFIG_FILE "openssl.cnf" |