diff options
| author | Rich Salz <rsalz@openssl.org> | 2014-09-23 13:23:09 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2014-12-10 17:31:04 -0500 |
| commit | 5cf37957fbdb7e2a1be48e15c4114d218c135f73 (patch) | |
| tree | 1208728955b062762d2c327fd08d268c0942177e /apps | |
| parent | a4a934119dd213e16c9d8b11150a4815604c13bb (diff) | |
| download | openssl-5cf37957fbdb7e2a1be48e15c4114d218c135f73.tar.gz | |
RT3543: Remove #ifdef LINT
I also replaced some exit/return wrappers in various
programs (from main) to standardize on return.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dhparam.c | 3 | ||||
| -rw-r--r-- | apps/dsaparam.c | 3 | ||||
| -rw-r--r-- | apps/gendh.c | 3 | ||||
| -rw-r--r-- | apps/genpkey.c | 3 | ||||
| -rw-r--r-- | apps/genrsa.c | 3 | ||||
| -rw-r--r-- | apps/req.c | 3 | ||||
| -rw-r--r-- | apps/speed.c | 9 |
7 files changed, 0 insertions, 27 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index c4cf1685a3..1127d10c1c 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -560,9 +560,6 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb) if (p == 3) c='\n'; BIO_write(BN_GENCB_get_arg(cb),&c,1); (void)BIO_flush(BN_GENCB_get_arg(cb)); -#ifdef LINT - p=n; -#endif return 1; } diff --git a/apps/dsaparam.c b/apps/dsaparam.c index e51f5026de..8ee5d42ae7 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -482,9 +482,6 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb) if (p == 3) c='\n'; BIO_write(BN_GENCB_get_arg(cb),&c,1); (void)BIO_flush(BN_GENCB_get_arg(cb)); -#ifdef LINT - p=n; -#endif #ifdef GENCB_TEST if(stop_keygen_flag) return 0; diff --git a/apps/gendh.c b/apps/gendh.c index 1536cbf3d2..c8645a4993 100644 --- a/apps/gendh.c +++ b/apps/gendh.c @@ -233,9 +233,6 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb) if (p == 3) c='\n'; BIO_write(BN_GENCB_get_arg(cb),&c,1); (void)BIO_flush(BN_GENCB_get_arg(cb)); -#ifdef LINT - p=n; -#endif return 1; } #else /* !OPENSSL_NO_DH */ diff --git a/apps/genpkey.c b/apps/genpkey.c index 6dfda08b9e..685e2c6b16 100644 --- a/apps/genpkey.c +++ b/apps/genpkey.c @@ -433,8 +433,5 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx) if (p == 3) c='\n'; BIO_write(b,&c,1); (void)BIO_flush(b); -#ifdef LINT - p=n; -#endif return 1; } diff --git a/apps/genrsa.c b/apps/genrsa.c index 7b0bcc20e1..54e30d343b 100644 --- a/apps/genrsa.c +++ b/apps/genrsa.c @@ -327,9 +327,6 @@ static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb) if (p == 3) c='\n'; BIO_write(BN_GENCB_get_arg(cb),&c,1); (void)BIO_flush(BN_GENCB_get_arg(cb)); -#ifdef LINT - p=n; -#endif return 1; } #else /* !OPENSSL_NO_RSA */ diff --git a/apps/req.c b/apps/req.c index 6a19144931..87ab41293d 100644 --- a/apps/req.c +++ b/apps/req.c @@ -1773,9 +1773,6 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx) if (p == 3) c='\n'; BIO_write(b,&c,1); (void)BIO_flush(b); -#ifdef LINT - p=n; -#endif return 1; } diff --git a/apps/speed.c b/apps/speed.c index b5d7921e5f..e5742e624b 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -272,9 +272,6 @@ static SIGRETTYPE sig_done(int sig) { signal(SIGALRM,sig_done); run=0; -#ifdef LINT - sig=sig; -#endif } #endif @@ -2649,9 +2646,6 @@ static void print_message(const char *s, long num, int length) : "Doing %s %ld times on %d size blocks: ",s,num,length); (void)BIO_flush(bio_err); #endif -#ifdef LINT - num=num; -#endif } static void pkey_print_message(const char *str, const char *str2, long num, @@ -2667,9 +2661,6 @@ static void pkey_print_message(const char *str, const char *str2, long num, : "Doing %ld %d bit %s %s's: ",num,bits,str,str2); (void)BIO_flush(bio_err); #endif -#ifdef LINT - num=num; -#endif } static void print_result(int alg,int run_no,int count,double time_used) |