diff options
| author | Matt Caswell <matt@openssl.org> | 2022-12-06 14:35:53 +0000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-12-22 11:01:06 +0100 |
| commit | 0f48050b5a8881870b8e25382f817b3a3dc14f16 (patch) | |
| tree | 901423a05c023115886accc0b8e7008df3adf8e7 /crypto | |
| parent | 9e5bd8923bff3e4f0cbba05c7dadfe289c66eb6f (diff) | |
Fix BIO_f_asn1() to properly report some errors
Some things that may go wrong in asn1_bio_write() are serious errors
that should be reported as -1, rather than 0 (which just means "we wrote
no data").
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19918)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/bio_asn1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c index c6eabc0d61..f149942501 100644 --- a/crypto/asn1/bio_asn1.c +++ b/crypto/asn1/bio_asn1.c @@ -172,7 +172,7 @@ static int asn1_bio_write(BIO *b, const char *in, int inl) case ASN1_STATE_START: if (!asn1_bio_setup_ex(b, ctx, ctx->prefix, ASN1_STATE_PRE_COPY, ASN1_STATE_HEADER)) - return 0; + return -1; break; /* Copy any pre data first */ @@ -189,7 +189,7 @@ static int asn1_bio_write(BIO *b, const char *in, int inl) case ASN1_STATE_HEADER: ctx->buflen = ASN1_object_size(0, inl, ctx->asn1_tag) - inl; if (!ossl_assert(ctx->buflen <= ctx->bufsize)) - return 0; + return -1; p = ctx->buf; ASN1_put_object(&p, 0, inl, ctx->asn1_tag, ctx->asn1_class); ctx->copylen = inl; |