summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/apps/dgst.c2
-rw-r--r--src/lib/libssl/src/apps/nseq.c2
-rw-r--r--src/lib/libssl/src/apps/passwd.c2
-rw-r--r--src/lib/libssl/src/apps/pkcs12.c2
-rw-r--r--src/lib/libssl/src/apps/req.c2
-rw-r--r--src/lib/libssl/src/apps/speed.c2
-rw-r--r--src/lib/libssl/src/apps/verify.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/src/apps/dgst.c b/src/lib/libssl/src/apps/dgst.c
index 4a4fa6ff55..08641f1c5c 100644
--- a/src/lib/libssl/src/apps/dgst.c
+++ b/src/lib/libssl/src/apps/dgst.c
@@ -507,7 +507,7 @@ end:
507 if (bmd != NULL) 507 if (bmd != NULL)
508 BIO_free(bmd); 508 BIO_free(bmd);
509 apps_shutdown(); 509 apps_shutdown();
510 exit(err); 510 return(err);
511} 511}
512 512
513int 513int
diff --git a/src/lib/libssl/src/apps/nseq.c b/src/lib/libssl/src/apps/nseq.c
index a965f1d703..cb83570562 100644
--- a/src/lib/libssl/src/apps/nseq.c
+++ b/src/lib/libssl/src/apps/nseq.c
@@ -102,7 +102,7 @@ int MAIN(int argc, char **argv)
102 BIO_printf (bio_err, "-in file input file\n"); 102 BIO_printf (bio_err, "-in file input file\n");
103 BIO_printf (bio_err, "-out file output file\n"); 103 BIO_printf (bio_err, "-out file output file\n");
104 BIO_printf (bio_err, "-toseq output NS Sequence file\n"); 104 BIO_printf (bio_err, "-toseq output NS Sequence file\n");
105 exit(1); 105 return(1);
106 } 106 }
107 107
108 if (infile) { 108 if (infile) {
diff --git a/src/lib/libssl/src/apps/passwd.c b/src/lib/libssl/src/apps/passwd.c
index ea62a14487..7f99e3fd23 100644
--- a/src/lib/libssl/src/apps/passwd.c
+++ b/src/lib/libssl/src/apps/passwd.c
@@ -497,6 +497,6 @@ err:
497int MAIN(int argc, char **argv) 497int MAIN(int argc, char **argv)
498 { 498 {
499 fputs("Program not available.\n", stderr) 499 fputs("Program not available.\n", stderr)
500 exit(1); 500 return(1);
501 } 501 }
502#endif 502#endif
diff --git a/src/lib/libssl/src/apps/pkcs12.c b/src/lib/libssl/src/apps/pkcs12.c
index 74d063ef5e..465ff2ebf0 100644
--- a/src/lib/libssl/src/apps/pkcs12.c
+++ b/src/lib/libssl/src/apps/pkcs12.c
@@ -692,7 +692,7 @@ int MAIN(int argc, char **argv)
692 if(passin) free(passin); 692 if(passin) free(passin);
693 if(passout) free(passout); 693 if(passout) free(passout);
694 apps_shutdown(); 694 apps_shutdown();
695 exit(ret); 695 return(ret);
696} 696}
697 697
698int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass, 698int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
diff --git a/src/lib/libssl/src/apps/req.c b/src/lib/libssl/src/apps/req.c
index 527b893a28..690ec0d625 100644
--- a/src/lib/libssl/src/apps/req.c
+++ b/src/lib/libssl/src/apps/req.c
@@ -1097,7 +1097,7 @@ end:
1097 if(passargout && passout) free(passout); 1097 if(passargout && passout) free(passout);
1098 OBJ_cleanup(); 1098 OBJ_cleanup();
1099 apps_shutdown(); 1099 apps_shutdown();
1100 exit(ex); 1100 return(ex);
1101 } 1101 }
1102 1102
1103static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int multirdn, 1103static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int multirdn,
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index 59f28e4d58..473dfce124 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -2522,7 +2522,7 @@ end:
2522#endif 2522#endif
2523 2523
2524 apps_shutdown(); 2524 apps_shutdown();
2525 exit(mret); 2525 return(mret);
2526 } 2526 }
2527 2527
2528static void print_message(const char *s, long num, int length) 2528static void print_message(const char *s, long num, int length)
diff --git a/src/lib/libssl/src/apps/verify.c b/src/lib/libssl/src/apps/verify.c
index 135d76d667..ebd314d7cc 100644
--- a/src/lib/libssl/src/apps/verify.c
+++ b/src/lib/libssl/src/apps/verify.c
@@ -260,7 +260,7 @@ end:
260 sk_X509_pop_free(trusted, X509_free); 260 sk_X509_pop_free(trusted, X509_free);
261 sk_X509_CRL_pop_free(crls, X509_CRL_free); 261 sk_X509_CRL_pop_free(crls, X509_CRL_free);
262 apps_shutdown(); 262 apps_shutdown();
263 exit(ret < 0 ? 2 : ret); 263 return(ret < 0 ? 2 : ret);
264 } 264 }
265 265
266static int check(X509_STORE *ctx, char *file, 266static int check(X509_STORE *ctx, char *file,