diff options
Diffstat (limited to 'package/libs/openssl/patches/210-eng_devcrypto-expand-digest-failure-cases.patch')
-rw-r--r-- | package/libs/openssl/patches/210-eng_devcrypto-expand-digest-failure-cases.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/libs/openssl/patches/210-eng_devcrypto-expand-digest-failure-cases.patch b/package/libs/openssl/patches/210-eng_devcrypto-expand-digest-failure-cases.patch new file mode 100644 index 0000000000..9e59a16ac2 --- /dev/null +++ b/package/libs/openssl/patches/210-eng_devcrypto-expand-digest-failure-cases.patch @@ -0,0 +1,37 @@ +From add2ab1f289c24a1563c5b895d5cd133fe874f12 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz <cote2004-github@yahoo.com> +Date: Wed, 14 Nov 2018 11:22:14 -0200 +Subject: [PATCH 2/7] eng_devcrypto: expand digest failure cases + +Return failure when the digest_ctx is null in digest_update and +digest_final, and when md is null in digest_final. + +Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> + +Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> +Reviewed-by: Richard Levitte <levitte@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/7585) + +(cherry picked from commit 4d9f99654441e36fdcb49540a1dbc9d4c70ccb68) + +--- a/crypto/engine/eng_devcrypto.c ++++ b/crypto/engine/eng_devcrypto.c +@@ -438,6 +438,9 @@ static int digest_update(EVP_MD_CTX *ctx + if (count == 0) + return 1; + ++ if (digest_ctx == NULL) ++ return 0; ++ + if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) < 0) { + SYSerr(SYS_F_IOCTL, errno); + return 0; +@@ -451,6 +454,8 @@ static int digest_final(EVP_MD_CTX *ctx, + struct digest_ctx *digest_ctx = + (struct digest_ctx *)EVP_MD_CTX_md_data(ctx); + ++ if (md == NULL || digest_ctx == NULL) ++ return 0; + if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) { + SYSerr(SYS_F_IOCTL, errno); + return 0; |