210-eng_devcrypto-expand-digest-failure-cases.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From add2ab1f289c24a1563c5b895d5cd133fe874f12 Mon Sep 17 00:00:00 2001
  2. From: Eneas U de Queiroz <[email protected]>
  3. Date: Wed, 14 Nov 2018 11:22:14 -0200
  4. Subject: [PATCH 2/7] eng_devcrypto: expand digest failure cases
  5. Return failure when the digest_ctx is null in digest_update and
  6. digest_final, and when md is null in digest_final.
  7. Signed-off-by: Eneas U de Queiroz <[email protected]>
  8. Reviewed-by: Matthias St. Pierre <[email protected]>
  9. Reviewed-by: Richard Levitte <[email protected]>
  10. (Merged from https://github.com/openssl/openssl/pull/7585)
  11. (cherry picked from commit 4d9f99654441e36fdcb49540a1dbc9d4c70ccb68)
  12. --- a/crypto/engine/eng_devcrypto.c
  13. +++ b/crypto/engine/eng_devcrypto.c
  14. @@ -438,6 +438,9 @@ static int digest_update(EVP_MD_CTX *ctx
  15. if (count == 0)
  16. return 1;
  17. + if (digest_ctx == NULL)
  18. + return 0;
  19. +
  20. if (digest_op(digest_ctx, data, count, NULL, COP_FLAG_UPDATE) < 0) {
  21. SYSerr(SYS_F_IOCTL, errno);
  22. return 0;
  23. @@ -451,6 +454,8 @@ static int digest_final(EVP_MD_CTX *ctx,
  24. struct digest_ctx *digest_ctx =
  25. (struct digest_ctx *)EVP_MD_CTX_md_data(ctx);
  26. + if (md == NULL || digest_ctx == NULL)
  27. + return 0;
  28. if (digest_op(digest_ctx, NULL, 0, md, COP_FLAG_FINAL) < 0) {
  29. SYSerr(SYS_F_IOCTL, errno);
  30. return 0;