[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  aa291c62a7c227d94073c8cd4ce81aa6950d72d7 (commit)
      from  02f70372470b4dd3b21443bb615292175f5d2c88 (commit)


- Log -----------------------------------------------------------------
commit aa291c62a7c227d94073c8cd4ce81aa6950d72d7
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jan 19 15:17:41 2016 +0000

    prf redirection build fixes
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/kdf/tls1_prf.c | 2 +-
 util/mkfiles.pl       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c
index 3c14b90..374c6e4 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 bc17462..ed47224 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",