Commit 811cd997 authored by Richard Levitte's avatar Richard Levitte
Browse files

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)
parent 29a0f955

apps/asn1pars.c

+1 −1
Original line number Diff line number Diff line
@@ -328,6 +328,6 @@ end: 
	if (at != NULL) ASN1_TYPE_free(at);

	if (osk != NULL) sk_free(osk);

	OBJ_cleanup();

	EXIT(ret);

	OPENSSL_EXIT(ret);

	}

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -1280,7 +1280,7 @@ err: 
	X509_CRL_free(crl);

	CONF_free(conf);

	OBJ_cleanup();

	EXIT(ret);

	OPENSSL_EXIT(ret);

	}



static void lookup_fail(char *name, char *tag)

apps/ciphers.c

+1 −1
Original line number Diff line number Diff line
@@ -202,6 +202,6 @@ end: 
	if (ctx != NULL) SSL_CTX_free(ctx);

	if (ssl != NULL) SSL_free(ssl);

	if (STDout != NULL) BIO_free_all(STDout);

	EXIT(ret);

	OPENSSL_EXIT(ret);

	}

apps/crl.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ end: 
		X509_STORE_CTX_cleanup(&ctx);

		X509_STORE_free(store);

	}

	EXIT(ret);

	OPENSSL_EXIT(ret);

	}



static X509_CRL *load_crl(char *infile, int format)

apps/crl2p7.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ bad: 
		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");

		BIO_printf(bio_err,"                (can be used more than once)\n");

		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");

		EXIT(1);

		OPENSSL_EXIT(1);

		}



	ERR_load_crypto_strings();
@@ -278,7 +278,7 @@ end: 
	if (p7 != NULL) PKCS7_free(p7);

	if (crl != NULL) X509_CRL_free(crl);



	EXIT(ret);

	OPENSSL_EXIT(ret);

	}



/*