diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-10-08 22:00:27 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-10-23 19:52:08 +0200 |
| commit | 070c23325af4526c9a8532a60d63522c58d5554b (patch) | |
| tree | 91a589786247ff47da757a51294768b1fe888b24 /apps | |
| parent | 8cf9d71a3a43d9b98a8a278d47dc08088a954a7b (diff) | |
Remove useless code
RT#4081
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.c | 3 | ||||
| -rw-r--r-- | apps/ca.c | 12 | ||||
| -rw-r--r-- | apps/ecparam.c | 2 | ||||
| -rw-r--r-- | apps/engine.c | 5 | ||||
| -rw-r--r-- | apps/gendsa.c | 2 |
5 files changed, 3 insertions, 21 deletions
diff --git a/apps/apps.c b/apps/apps.c index 39ca963b5f..c519ae612e 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -118,9 +118,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && !defined(NETWARE_CLIB) -# include <strings.h> -#endif #ifndef NO_SYS_TYPES_H # include <sys/types.h> #endif @@ -98,24 +98,18 @@ #undef BSIZE #define BSIZE 256 -#define BASE_SECTION "ca" +#define BASE_SECTION "ca" #define ENV_DEFAULT_CA "default_ca" -#define STRING_MASK "string_mask" +#define STRING_MASK "string_mask" #define UTF8_IN "utf8" -#define ENV_DIR "dir" -#define ENV_CERTS "certs" -#define ENV_CRL_DIR "crl_dir" -#define ENV_CA_DB "CA_DB" #define ENV_NEW_CERTS_DIR "new_certs_dir" -#define ENV_CERTIFICATE "certificate" +#define ENV_CERTIFICATE "certificate" #define ENV_SERIAL "serial" #define ENV_CRLNUMBER "crlnumber" -#define ENV_CRL "crl" #define ENV_PRIVATE_KEY "private_key" -#define ENV_RANDFILE "RANDFILE" #define ENV_DEFAULT_DAYS "default_days" #define ENV_DEFAULT_STARTDATE "default_startdate" #define ENV_DEFAULT_ENDDATE "default_enddate" diff --git a/apps/ecparam.c b/apps/ecparam.c index 9d13447283..122125ee4e 100644 --- a/apps/ecparam.c +++ b/apps/ecparam.c @@ -317,8 +317,6 @@ int ecparam_main(int argc, char **argv) } if (check) { - if (group == NULL) - BIO_printf(bio_err, "no elliptic curve parameters\n"); BIO_printf(bio_err, "checking elliptic curve parameters: "); if (!EC_GROUP_check(group, NULL)) { BIO_printf(bio_err, "failed\n"); diff --git a/apps/engine.c b/apps/engine.c index b4da23ee89..17e6f789f7 100644 --- a/apps/engine.c +++ b/apps/engine.c @@ -94,17 +94,12 @@ static void identity(char *ptr) static int append_buf(char **buf, const char *s, int *size, int step) { - int l = strlen(s); - if (*buf == NULL) { *size = step; *buf = app_malloc(*size, "engine buffer"); **buf = '\0'; } - if (**buf != '\0') - l += 2; /* ", " */ - if (strlen(*buf) + strlen(s) >= (unsigned int)*size) { *size += step; *buf = OPENSSL_realloc(*buf, *size); diff --git a/apps/gendsa.c b/apps/gendsa.c index 5d5cb5efdd..9259c6ccaa 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -69,8 +69,6 @@ # include <openssl/x509.h> # include <openssl/pem.h> -# define DEFBITS 512 - typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_OUT, OPT_PASSOUT, OPT_ENGINE, OPT_RAND, OPT_CIPHER |