diff options
| author | slontis <shane.lontis@oracle.com> | 2023-03-20 14:48:33 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-04-24 14:39:19 +0200 |
| commit | 09ff84bd2752cac649f57cfbf95b49dbce1c69ee (patch) | |
| tree | 9a3dbf4aa9835f2be7d874cde743f6dfa1de6293 /demos/kdf | |
| parent | a80840c663e3409203b0235764e53d8624f74cb8 (diff) | |
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 <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20545)
Diffstat (limited to 'demos/kdf')
| -rw-r--r-- | demos/kdf/hkdf.c | 6 | ||||
| -rw-r--r-- | demos/kdf/pbkdf2.c | 6 | ||||
| -rw-r--r-- | demos/kdf/scrypt.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/demos/kdf/hkdf.c b/demos/kdf/hkdf.c index cb7a170e94..52f505cfa3 100644 --- a/demos/kdf/hkdf.c +++ b/demos/kdf/hkdf.c @@ -43,7 +43,7 @@ static unsigned char hkdf_okm[] = { int main(int argc, char **argv) { - int rv = 1; + int ret = EXIT_FAILURE; EVP_KDF *kdf = NULL; EVP_KDF_CTX *kctx = NULL; unsigned char out[42]; @@ -95,10 +95,10 @@ int main(int argc, char **argv) goto end; } - rv = 0; + ret = EXIT_SUCCESS; end: EVP_KDF_CTX_free(kctx); EVP_KDF_free(kdf); OSSL_LIB_CTX_free(library_context); - return rv; + return ret; } diff --git a/demos/kdf/pbkdf2.c b/demos/kdf/pbkdf2.c index ae0a63bf60..fc87e6bbe0 100644 --- a/demos/kdf/pbkdf2.c +++ b/demos/kdf/pbkdf2.c @@ -57,7 +57,7 @@ static const unsigned char expected_output[] = { int main(int argc, char **argv) { - int rv = 1; + int ret = EXIT_FAILURE; EVP_KDF *kdf = NULL; EVP_KDF_CTX *kctx = NULL; unsigned char out[64]; @@ -108,10 +108,10 @@ int main(int argc, char **argv) goto end; } - rv = 0; + ret = EXIT_SUCCESS; end: EVP_KDF_CTX_free(kctx); EVP_KDF_free(kdf); OSSL_LIB_CTX_free(library_context); - return rv; + return ret; } diff --git a/demos/kdf/scrypt.c b/demos/kdf/scrypt.c index 2be9908800..e4565ae724 100644 --- a/demos/kdf/scrypt.c +++ b/demos/kdf/scrypt.c @@ -59,7 +59,7 @@ static const unsigned char expected_output[] = { int main(int argc, char **argv) { - int rv = 1; + int ret = EXIT_FAILURE; EVP_KDF *kdf = NULL; EVP_KDF_CTX *kctx = NULL; unsigned char out[64]; @@ -111,10 +111,10 @@ int main(int argc, char **argv) goto end; } - rv = 0; + ret = EXIT_SUCCESS; end: EVP_KDF_CTX_free(kctx); EVP_KDF_free(kdf); OSSL_LIB_CTX_free(library_context); - return rv; + return ret; } |