diff options
| author |   tb <tb@openbsd.org> | 2018-08-24 19:47:25 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-08-24 19:47:25 +0000 |
| commit | 0e8b19c0157382b66f92f6ab356124f458baf940 (patch) | |
| tree | c5a9ca8baf146beffc07e88557986d7d0a40f20d | |
| parent | Convert EVP_EncodeUpdate() to return an int to allow for error (diff) | |
| download | wireguard-openbsd-0e8b19c0157382b66f92f6ab356124f458baf940.tar.xz wireguard-openbsd-0e8b19c0157382b66f92f6ab356124f458baf940.zip | |
Check return value of EVP_EncodeUpdate() in b64_write().
ok jsing
| -rw-r--r-- | lib/libcrypto/evp/bio_b64.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libcrypto/evp/bio_b64.c b/lib/libcrypto/evp/bio_b64.c index a13d26a8840..82aaa8bf7a2 100644 --- a/lib/libcrypto/evp/bio_b64.c +++ b/lib/libcrypto/evp/bio_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_b64.c,v 1.21 2018/05/02 15:51:41 tb Exp $ */ +/* $OpenBSD: bio_b64.c,v 1.22 2018/08/24 19:47:25 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -430,9 +430,10 @@ b64_write(BIO *b, const char *in, int inl) ret += n; } } else { - EVP_EncodeUpdate(&(ctx->base64), + if (!EVP_EncodeUpdate(&(ctx->base64), (unsigned char *)ctx->buf, &ctx->buf_len, - (unsigned char *)in, n); + (unsigned char *)in, n)) + return ((ret == 0) ? -1 : ret); OPENSSL_assert(ctx->buf_len <= (int)sizeof(ctx->buf)); OPENSSL_assert(ctx->buf_len >= ctx->buf_off); ret += n; |