From d339f4070c40c30d99ba51df0231559efbb4280e Mon Sep 17 00:00:00 2001 From: slontis Date: Mon, 20 Mar 2023 14:48:33 +1000 Subject: Fixup demo exit status magic numbers The demo code is quite often block copied for new demos, so this PR changes demos to use EXIT_SUCCESS & EXIT_FAILURE instead of using 0 and 1. Internal functions use the normal notation of 0 = error, 1 = success, but the value returned by main() must use EXIT_SUCCESS and EXIT_FAILURE. Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (cherry picked from commit 09ff84bd2752cac649f57cfbf95b49dbce1c69ee) Reviewed-by: Hugo Landau (Merged from https://github.com/openssl/openssl/pull/22728) --- demos/smime/smdec.c | 6 +++--- demos/smime/smenc.c | 6 +++--- demos/smime/smsign.c | 6 +++--- demos/smime/smsign2.c | 6 +++--- demos/smime/smver.c | 7 +++---- 5 files changed, 15 insertions(+), 16 deletions(-) (limited to 'demos/smime') diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c index debcedd5e8..bd8ac88d93 100644 --- a/demos/smime/smdec.c +++ b/demos/smime/smdec.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) X509 *rcert = NULL; EVP_PKEY *rkey = NULL; PKCS7 *p7 = NULL; - int ret = 1; + int ret = EXIT_FAILURE; OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); @@ -59,10 +59,10 @@ int main(int argc, char **argv) if (!PKCS7_decrypt(p7, rkey, rcert, out, 0)) goto err; - ret = 0; + ret = EXIT_SUCCESS; err: - if (ret) { + if (ret != EXIT_SUCCESS) { fprintf(stderr, "Error Signing Data\n"); ERR_print_errors_fp(stderr); } diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c index 0714dddfd2..a0c365a977 100644 --- a/demos/smime/smenc.c +++ b/demos/smime/smenc.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) X509 *rcert = NULL; STACK_OF(X509) *recips = NULL; PKCS7 *p7 = NULL; - int ret = 1; + int ret = EXIT_FAILURE; /* * On OpenSSL 0.9.9 only: @@ -73,10 +73,10 @@ int main(int argc, char **argv) if (!SMIME_write_PKCS7(out, p7, in, flags)) goto err; - ret = 0; + ret = EXIT_SUCCESS; err: - if (ret) { + if (ret != EXIT_SUCCESS) { fprintf(stderr, "Error Encrypting Data\n"); ERR_print_errors_fp(stderr); } diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c index ac2c27b525..6e627ec944 100644 --- a/demos/smime/smsign.c +++ b/demos/smime/smsign.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) X509 *scert = NULL; EVP_PKEY *skey = NULL; PKCS7 *p7 = NULL; - int ret = 1; + int ret = EXIT_FAILURE; /* * For simple S/MIME signing use PKCS7_DETACHED. On OpenSSL 0.9.9 only: @@ -69,10 +69,10 @@ int main(int argc, char **argv) if (!SMIME_write_PKCS7(out, p7, in, flags)) goto err; - ret = 0; + ret = EXIT_SUCCESS; err: - if (ret) { + if (ret != EXIT_SUCCESS) { fprintf(stderr, "Error Signing Data\n"); ERR_print_errors_fp(stderr); } diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c index a9e7025748..88a61b7f22 100644 --- a/demos/smime/smsign2.c +++ b/demos/smime/smsign2.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) X509 *scert = NULL, *scert2 = NULL; EVP_PKEY *skey = NULL, *skey2 = NULL; PKCS7 *p7 = NULL; - int ret = 1; + int ret = EXIT_FAILURE; OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); @@ -77,10 +77,10 @@ int main(int argc, char **argv) if (!SMIME_write_PKCS7(out, p7, in, PKCS7_STREAM)) goto err; - ret = 0; + ret = EXIT_SUCCESS; err: - if (ret) { + if (ret != EXIT_SUCCESS) { fprintf(stderr, "Error Signing Data\n"); ERR_print_errors_fp(stderr); } diff --git a/demos/smime/smver.c b/demos/smime/smver.c index 5d552b1808..9f77b7f552 100644 --- a/demos/smime/smver.c +++ b/demos/smime/smver.c @@ -18,8 +18,7 @@ int main(int argc, char **argv) X509_STORE *st = NULL; X509 *cacert = NULL; PKCS7 *p7 = NULL; - - int ret = 1; + int ret = EXIT_FAILURE; OpenSSL_add_all_algorithms(); ERR_load_crypto_strings(); @@ -69,10 +68,10 @@ int main(int argc, char **argv) fprintf(stderr, "Verification Successful\n"); - ret = 0; + ret = EXIT_SUCCESS; err: - if (ret) { + if (ret != EXIT_SUCCESS) { fprintf(stderr, "Error Verifying Data\n"); ERR_print_errors_fp(stderr); } -- cgit v1.2.3