prf redirection build fixes
authorDr. Stephen Henson <steve@openssl.org>
Tue, 19 Jan 2016 15:17:41 +0000 (15:17 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 19 Jan 2016 15:33:45 +0000 (15:33 +0000)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
crypto/kdf/tls1_prf.c
util/mkfiles.pl

index 3c14b90..374c6e4 100644 (file)
@@ -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,
index bc17462..ed47224 100755 (executable)
@@ -65,6 +65,7 @@ my @dirs = (
 "crypto/async",
 "crypto/chacha",
 "crypto/poly1305",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",