From 5cf37957fbdb7e2a1be48e15c4114d218c135f73 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 23 Sep 2014 13:23:09 -0400 Subject: RT3543: Remove #ifdef LINT I also replaced some exit/return wrappers in various programs (from main) to standardize on return. Reviewed-by: Richard Levitte --- apps/dhparam.c | 3 --- apps/dsaparam.c | 3 --- apps/gendh.c | 3 --- apps/genpkey.c | 3 --- apps/genrsa.c | 3 --- apps/req.c | 3 --- apps/speed.c | 9 --------- crypto/asn1/asn1_par.c | 3 --- crypto/des/read_pwd.c | 3 --- crypto/des/rpw.c | 10 ++-------- crypto/dh/dhtest.c | 3 --- crypto/ecdh/ecdhtest.c | 3 --- 12 files changed, 2 insertions(+), 47 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 @@ -2648,9 +2645,6 @@ static void print_message(const char *s, long num, int length) BIO_printf(bio_err,mr ? "+DN:%s:%ld:%d\n" : "Doing %s %ld times on %d size blocks: ",s,num,length); (void)BIO_flush(bio_err); -#endif -#ifdef LINT - num=num; #endif } @@ -2666,9 +2660,6 @@ static void pkey_print_message(const char *str, const char *str2, long num, BIO_printf(bio_err,mr ? "+DNP:%ld:%d:%s:%s\n" : "Doing %ld %d bit %s %s's: ",num,bits,str,str2); (void)BIO_flush(bio_err); -#endif -#ifdef LINT - num=num; #endif } diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index aaca69aebd..147aa47521 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -133,9 +133,6 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse { op=p; j=ASN1_get_object(&p,&len,&tag,&xclass,length); -#ifdef LINT - j=j; -#endif if (j & 0x80) { if (BIO_write(bp,"Error in encoding\n",18) <= 0) diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index 7e3f9020dc..ffc458a9c6 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -462,9 +462,6 @@ static void popsig(void) static void recsig(int i) { longjmp(save,1); -#ifdef LINT - i=i; -#endif } #ifdef OPENSSL_SYS_MSDOS diff --git a/crypto/des/rpw.c b/crypto/des/rpw.c index 8a9473c4f9..af1f0cf73f 100644 --- a/crypto/des/rpw.c +++ b/crypto/des/rpw.c @@ -86,14 +86,8 @@ int main(int argc, char *argv[]) for (i=0; i<8; i++) printf("%02x ",k1[i]); printf("\n"); - exit(1); + return(1); } - else - { - printf("error %d\n",i); - exit(0); - } -#ifdef LINT + printf("error %d\n",i); return(0); -#endif } diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c index 1d49d0462b..c98c8047a6 100644 --- a/crypto/dh/dhtest.c +++ b/crypto/dh/dhtest.c @@ -226,9 +226,6 @@ static int MS_CALLBACK cb(int p, int n, BN_GENCB *arg) if (p == 3) c='\n'; BIO_write(BN_GENCB_get_arg(arg),&c,1); (void)BIO_flush(BN_GENCB_get_arg(arg)); -#ifdef LINT - p=n; -#endif return 1; } diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c index 4b861fef61..e4c09455f1 100644 --- a/crypto/ecdh/ecdhtest.c +++ b/crypto/ecdh/ecdhtest.c @@ -537,9 +537,6 @@ static void MS_CALLBACK cb(int p, int n, void *arg) if (p == 3) c='\n'; BIO_write((BIO *)arg,&c,1); (void)BIO_flush((BIO *)arg); -#ifdef LINT - p=n; -#endif } #endif #endif -- cgit v1.2.3