diff options
| author | Tobias Nießen <tniessen@tnie.de> | 2021-03-02 18:15:32 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-03-04 10:17:20 +1000 |
| commit | e3a2ba75474eebffe14b4bab1a34a1c2012a3888 (patch) | |
| tree | 068fc1c7e51e840d0b3df86fe53c72acb1440c23 /crypto/encode_decode/decoder_pkey.c | |
| parent | 33ac7b324bdf6791b3ec4a2e3bde74fee8686ff4 (diff) | |
crypto: rename error flags in internal structures
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14405)
Diffstat (limited to 'crypto/encode_decode/decoder_pkey.c')
| -rw-r--r-- | crypto/encode_decode/decoder_pkey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c index 0fff6823bd..38764b418b 100644 --- a/crypto/encode_decode/decoder_pkey.c +++ b/crypto/encode_decode/decoder_pkey.c @@ -219,7 +219,7 @@ struct collect_decoder_data_st { STACK_OF(OPENSSL_CSTRING) *names; OSSL_DECODER_CTX *ctx; - unsigned int error_occured:1; + unsigned int error_occurred:1; }; static void collect_decoder(OSSL_DECODER *decoder, void *arg) @@ -229,10 +229,10 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg) const OSSL_PROVIDER *prov = OSSL_DECODER_provider(decoder); void *provctx = OSSL_PROVIDER_get0_provider_ctx(prov); - if (data->error_occured) + if (data->error_occurred) return; - data->error_occured = 1; /* Assume the worst */ + data->error_occurred = 1; /* Assume the worst */ if (data->names == NULL) return; @@ -266,7 +266,7 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg) decoder->freectx(decoderctx); } - data->error_occured = 0; /* All is good now */ + data->error_occurred = 0; /* All is good now */ } int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx, @@ -326,7 +326,7 @@ int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx, collect_decoder, &collect_decoder_data); sk_OPENSSL_CSTRING_free(names); - if (collect_decoder_data.error_occured) + if (collect_decoder_data.error_occurred) goto err; } |