EXIT() may mean return(). That's confusing, so let's have it really mean
exit() in whatever way works for the intended platform, and define
OPENSSL_EXIT() to have the old meaning (the name is of course because
it's only used in the openssl program)
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index dc41da3..5f8ba5e 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -361,7 +361,7 @@
if (osk != NULL) sk_free(osk);
OBJ_cleanup();
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
diff --git a/apps/ca.c b/apps/ca.c
index cac83a1..8cb5342 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1652,7 +1652,7 @@
NCONF_free(conf);
OBJ_cleanup();
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static void lookup_fail(char *name, char *tag)
diff --git a/apps/ciphers.c b/apps/ciphers.c
index fe26ae8..7c62fc5 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -203,6 +203,6 @@
if (ssl != NULL) SSL_free(ssl);
if (STDout != NULL) BIO_free_all(STDout);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/crl.c b/apps/crl.c
index 00946b4..c6089ac 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -377,7 +377,7 @@
X509_STORE_free(store);
}
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static X509_CRL *load_crl(char *infile, int format)
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 8729068..b2f2d12 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -280,7 +280,7 @@
if (crl != NULL) X509_CRL_free(crl);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
/*
diff --git a/apps/dgst.c b/apps/dgst.c
index c4bb7a1..280f79b 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -365,7 +365,7 @@
if(sigbuf) OPENSSL_free(sigbuf);
if (bmd != NULL) BIO_free(bmd);
apps_shutdown();
- EXIT(err);
+ OPENSSL_EXIT(err);
}
int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
diff --git a/apps/dh.c b/apps/dh.c
index 27c3dc8..c10ea96 100644
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -333,6 +333,6 @@
if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
#endif
diff --git a/apps/dhparam.c b/apps/dhparam.c
index ea15ef3..cbc65bc 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -519,7 +519,7 @@
if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
/* dh_cb is identical to dsa_cb in apps/dsaparam.c */
diff --git a/apps/dsa.c b/apps/dsa.c
index 9da1a41..6598871 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -314,6 +314,6 @@
if(passin) OPENSSL_free(passin);
if(passout) OPENSSL_free(passout);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
#endif
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 2f43680..320d76f 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -372,7 +372,7 @@
if (out != NULL) BIO_free_all(out);
if (dsa != NULL) DSA_free(dsa);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
diff --git a/apps/ec.c b/apps/ec.c
index 71ffaec..7d57341 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -390,6 +390,6 @@
if (passout)
OPENSSL_free(passout);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
#endif
diff --git a/apps/ecparam.c b/apps/ecparam.c
index 02bf6c1..3bd0a97 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -679,7 +679,7 @@
if (group != NULL)
EC_GROUP_free(group);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
diff --git a/apps/enc.c b/apps/enc.c
index bae7f21..42ddfd2 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -586,7 +586,7 @@
if (b64 != NULL) BIO_free(b64);
if(pass) OPENSSL_free(pass);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
int set_hex(char *in, unsigned char *out, int size)
diff --git a/apps/engine.c b/apps/engine.c
index 734ecb3..b718ae1 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -516,5 +516,5 @@
sk_pop_free(post_cmds, identity);
if (bio_out != NULL) BIO_free_all(bio_out);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/errstr.c b/apps/errstr.c
index fedb568..19489b0 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -122,5 +122,5 @@
}
}
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/gendh.c b/apps/gendh.c
index f254296..98ee413 100644
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -198,7 +198,7 @@
if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static void MS_CALLBACK dh_cb(int p, int n, void *arg)
diff --git a/apps/gendsa.c b/apps/gendsa.c
index 1e1e9f3..4600711 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -246,6 +246,6 @@
if (dsa != NULL) DSA_free(dsa);
if(passout) OPENSSL_free(passout);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
#endif
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 515bd7c..dbc23e4 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -258,7 +258,7 @@
if (ret != 0)
ERR_print_errors(bio_err);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
diff --git a/apps/nseq.c b/apps/nseq.c
index c26f62c..dc71d45 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -102,7 +102,7 @@
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);
+ OPENSSL_EXIT(1);
}
if (infile) {
@@ -162,6 +162,6 @@
BIO_free_all(out);
NETSCAPE_CERT_SEQUENCE_free(seq);
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/ocsp.c b/apps/ocsp.c
index d759b27..92922bc 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -899,7 +899,7 @@
SSL_CTX_free(ctx);
}
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
diff --git a/apps/openssl.c b/apps/openssl.c
index 45f8d7f..4789647 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -358,7 +358,7 @@
BIO_free(bio_err);
bio_err=NULL;
}
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
#define LIST_STANDARD_COMMANDS "list-standard-commands"
diff --git a/apps/passwd.c b/apps/passwd.c
index 0c2cf62..3ad91d8 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -292,7 +292,7 @@
if (out)
BIO_free_all(out);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
@@ -505,6 +505,6 @@
int MAIN(int argc, char **argv)
{
fputs("Program not available.\n", stderr)
- EXIT(1);
+ OPENSSL_EXIT(1);
}
#endif
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 536cf57..e445c24 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -651,7 +651,7 @@
if(passin) OPENSSL_free(passin);
if(passout) OPENSSL_free(passout);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 0cced40..738dd85 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -301,5 +301,5 @@
if (in != NULL) BIO_free(in);
if (out != NULL) BIO_free_all(out);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/rand.c b/apps/rand.c
index f51f5be..eaaa6e3 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -213,5 +213,5 @@
if (out)
BIO_free_all(out);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/req.c b/apps/req.c
index 980138f..a582e69 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1150,7 +1150,7 @@
if (ec_params != NULL) EC_KEY_free(ec_params);
#endif
apps_shutdown();
- EXIT(ex);
+ OPENSSL_EXIT(ex);
}
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int attribs,
diff --git a/apps/rsa.c b/apps/rsa.c
index 4e19bc1..aebec74 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -369,7 +369,7 @@
if(passin) OPENSSL_free(passin);
if(passout) OPENSSL_free(passout);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
#else /* !OPENSSL_NO_RSA */
diff --git a/apps/s_client.c b/apps/s_client.c
index 7b1fa7b..738588c 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -917,7 +917,7 @@
bio_c_out=NULL;
}
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/s_server.c b/apps/s_server.c
index 7380fcc..aa7ff66 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -946,7 +946,7 @@
bio_s_out=NULL;
}
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
diff --git a/apps/s_time.c b/apps/s_time.c
index 181a7c8..1ad16cd 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -642,7 +642,7 @@
tm_ctx=NULL;
}
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
/***********************************************************************
diff --git a/apps/sess_id.c b/apps/sess_id.c
index 41c3b3f..d91d84d 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -273,7 +273,7 @@
if (out != NULL) BIO_free_all(out);
if (x != NULL) SSL_SESSION_free(x);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static SSL_SESSION *load_sess_id(char *infile, int format)
diff --git a/apps/speed.c b/apps/speed.c
index 27f2e67..800ecd3 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2316,7 +2316,7 @@
#endif
apps_shutdown();
- EXIT(mret);
+ OPENSSL_EXIT(mret);
}
static void print_message(const char *s, long num, int length)
diff --git a/apps/spkac.c b/apps/spkac.c
index 4ce53e3..ed370c5 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -295,5 +295,5 @@
EVP_PKEY_free(pkey);
if(passin) OPENSSL_free(passin);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/verify.c b/apps/verify.c
index e4cbcea..9a18213 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -232,7 +232,7 @@
sk_X509_pop_free(untrusted, X509_free);
sk_X509_pop_free(trusted, X509_free);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e)
diff --git a/apps/version.c b/apps/version.c
index 435e0b4..041da37 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -212,5 +212,5 @@
if (dir) printf("%s\n",SSLeay_version(SSLEAY_DIR));
end:
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
diff --git a/apps/x509.c b/apps/x509.c
index 0f6e9ad..9709628 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -1029,7 +1029,7 @@
sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
if (passin) OPENSSL_free(passin);
apps_shutdown();
- EXIT(ret);
+ OPENSSL_EXIT(ret);
}
static ASN1_INTEGER *load_serial(char *CAfile, char *serialfile, int create)
