resolve conflicts

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c
index 18d307ea9e..553d212ebe 100644
--- a/src/lib/libcrypto/rsa/rsa_oaep.c
+++ b/src/lib/libcrypto/rsa/rsa_oaep.c
@@ -56,7 +56,8 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
         seed = to + 1;
         db = to + SHA_DIGEST_LENGTH + 1;
 
-        EVP_Digest((void *)param, plen, db, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest((void *)param, plen, db, NULL, EVP_sha1(), NULL))
+                return 0;
         memset(db + SHA_DIGEST_LENGTH, 0,
                 emlen - flen - 2 * SHA_DIGEST_LENGTH - 1);
         db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01;
@@ -145,7 +146,8 @@ int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
         for (i = 0; i < dblen; i++)
                 db[i] ^= maskeddb[i];
 
-        EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1(), NULL))
+                return -1;
 
         if (memcmp(db, phash, SHA_DIGEST_LENGTH) != 0 || bad)
                 goto decoding_err;