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 3c14b904f873ff66d897db4f7c39068550a9f182..374c6e49ec60af95bd2da01cbb47b63e793ac22f 100644 (file)
--- 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 bc17462033012ff02b1c63b896eabc5b3362e69e..ed47224261b841699c485956e2e1c93faf800025 100755 (executable)
--- 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",