oops, exit vs return; spotted by matthew

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:
         if (bmd != NULL)
                 BIO_free(bmd);
         apps_shutdown();
-        exit(err);
+        return(err);
 }
 
 int
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)
                 BIO_printf (bio_err, "-in file  input file\n");
                 BIO_printf (bio_err, "-out file output file\n");
                 BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
-                exit(1);
+                return(1);
         }
 
         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:
 int MAIN(int argc, char **argv)
         {
         fputs("Program not available.\n", stderr)
-        exit(1);
+        return(1);
         }
 #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)
     if(passin) free(passin);
     if(passout) free(passout);
     apps_shutdown();
-    exit(ret);
+    return(ret);
 }
 
 int 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:
         if(passargout && passout) free(passout);
         OBJ_cleanup();
         apps_shutdown();
-        exit(ex);
+        return(ex);
         }
 
 static 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:
 #endif
 
         apps_shutdown();
-        exit(mret);
+        return(mret);
         }
 
 static 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:
         sk_X509_pop_free(trusted, X509_free);
         sk_X509_CRL_pop_free(crls, X509_CRL_free);
         apps_shutdown();
-        exit(ret < 0 ? 2 : ret);
+        return(ret < 0 ? 2 : ret);
         }
 
 static int check(X509_STORE *ctx, char *file,