diff options
| author | tb <> | 2024-08-04 08:15:36 +0000 |
|---|---|---|
| committer | tb <> | 2024-08-04 08:15:36 +0000 |
| commit | b06a5f483323abf6b2173be4a8056e05bddfcd63 (patch) | |
| tree | be70a3daebc329527615e427f104a324dccc30b2 /src | |
| parent | 57946fcb6c73857d80cc35f6f670878d8f6438d9 (diff) | |
| download | openbsd-b06a5f483323abf6b2173be4a8056e05bddfcd63.tar.gz openbsd-b06a5f483323abf6b2173be4a8056e05bddfcd63.tar.bz2 openbsd-b06a5f483323abf6b2173be4a8056e05bddfcd63.zip | |
x509_vfy.c: drop some unnecessary parentheses
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index 501f5e5710..4f597fa313 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_vfy.c,v 1.143 2024/04/08 23:46:21 beck Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.144 2024/08/04 08:15:36 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -646,7 +646,7 @@ X509_verify_cert(X509_STORE_CTX *ctx) | |||
| 646 | x509_verify_ctx_free(vctx); | 646 | x509_verify_ctx_free(vctx); |
| 647 | 647 | ||
| 648 | /* if we succeed we have a chain in ctx->chain */ | 648 | /* if we succeed we have a chain in ctx->chain */ |
| 649 | return (chain_count > 0 && ctx->chain != NULL); | 649 | return chain_count > 0 && ctx->chain != NULL; |
| 650 | } | 650 | } |
| 651 | LCRYPTO_ALIAS(X509_verify_cert); | 651 | LCRYPTO_ALIAS(X509_verify_cert); |
| 652 | 652 | ||
| @@ -1012,7 +1012,7 @@ check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) | |||
| 1012 | if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME) | 1012 | if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME) |
| 1013 | ptime = &ctx->param->check_time; | 1013 | ptime = &ctx->param->check_time; |
| 1014 | else if (ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME) | 1014 | else if (ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME) |
| 1015 | return (1); | 1015 | return 1; |
| 1016 | else | 1016 | else |
| 1017 | ptime = NULL; | 1017 | ptime = NULL; |
| 1018 | 1018 | ||
| @@ -2298,7 +2298,7 @@ X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *leaf, | |||
| 2298 | } | 2298 | } |
| 2299 | 2299 | ||
| 2300 | if (CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE_CTX, ctx, | 2300 | if (CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE_CTX, ctx, |
| 2301 | &(ctx->ex_data)) == 0) { | 2301 | &ctx->ex_data) == 0) { |
| 2302 | X509error(ERR_R_MALLOC_FAILURE); | 2302 | X509error(ERR_R_MALLOC_FAILURE); |
| 2303 | return 0; | 2303 | return 0; |
| 2304 | } | 2304 | } |
| @@ -2337,8 +2337,7 @@ X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx) | |||
| 2337 | sk_X509_pop_free(ctx->chain, X509_free); | 2337 | sk_X509_pop_free(ctx->chain, X509_free); |
| 2338 | ctx->chain = NULL; | 2338 | ctx->chain = NULL; |
| 2339 | } | 2339 | } |
| 2340 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509_STORE_CTX, | 2340 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509_STORE_CTX, ctx, &ctx->ex_data); |
| 2341 | ctx, &(ctx->ex_data)); | ||
| 2342 | memset(&ctx->ex_data, 0, sizeof(CRYPTO_EX_DATA)); | 2341 | memset(&ctx->ex_data, 0, sizeof(CRYPTO_EX_DATA)); |
| 2343 | } | 2342 | } |
| 2344 | LCRYPTO_ALIAS(X509_STORE_CTX_cleanup); | 2343 | LCRYPTO_ALIAS(X509_STORE_CTX_cleanup); |
