From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 19 Jan 2016 15:17:41 +0000 (+0000)
Subject: prf redirection build fixes
X-Git-Tag: OpenSSL_1_1_0-pre3~489
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa291c62a7c227d94073c8cd4ce81aa6950d72d7;p=oweals%2Fopenssl.git

prf redirection build fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c
index 3c14b904f8..374c6e49ec 100644
--- a/crypto/kdf/tls1_prf.c
+++ b/crypto/kdf/tls1_prf.c
@@ -142,7 +142,7 @@ static int pkey_tls1_prf_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
                                 size_t *keylen)
 {
     TLS1_PRF_PKEY_CTX *kctx = ctx->data;
-    if (kctx->md == NULL || kctx->sec == NULL || kctx->seed == NULL)
+    if (kctx->md == NULL || kctx->sec == NULL || kctx->seedlen == 0)
         return 0;
     return tls1_prf_alg(kctx->md, kctx->sec, kctx->seclen,
                         kctx->seed, kctx->seedlen,
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index bc17462033..ed47224261 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -65,6 +65,7 @@ my @dirs = (
 "crypto/async",
 "crypto/chacha",
 "crypto/poly1305",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",