From: Matt Caswell <matt@openssl.org>
Date: Wed, 21 Jun 2017 14:55:38 +0000 (+0100)
Subject: Remove OPENSSL_assert() from crypto/kdf
X-Git-Tag: OpenSSL_1_1_1-pre1~808
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=7d248ee0aed6bf364b96fd100835b15ccfede309;hp=8f9ee7a33f4e8a52642335673f2cdc57ecdd38cc;ds=sidebyside

Remove OPENSSL_assert() from crypto/kdf

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3740)
---

diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c
index 063ea0390a..ce8425d4d4 100644
--- a/crypto/kdf/tls1_prf.c
+++ b/crypto/kdf/tls1_prf.c
@@ -184,7 +184,8 @@ static int tls1_prf_P_hash(const EVP_MD *md,
     int ret = 0;
 
     chunk = EVP_MD_size(md);
-    OPENSSL_assert(chunk >= 0);
+    if (!ossl_assert(chunk >= 0))
+        goto err;
 
     ctx = EVP_MD_CTX_new();
     ctx_tmp = EVP_MD_CTX_new();