diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-01-19 15:17:41 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-19 15:33:45 +0000 |
| commit | aa291c62a7c227d94073c8cd4ce81aa6950d72d7 (patch) | |
| tree | 75d29e34a636128011fe16836c155cede2bef3c0 | |
| parent | 02f70372470b4dd3b21443bb615292175f5d2c88 (diff) | |
| download | openssl-aa291c62a7c227d94073c8cd4ce81aa6950d72d7.tar.gz | |
prf redirection build fixes
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
| -rw-r--r-- | crypto/kdf/tls1_prf.c | 2 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 1 |
2 files changed, 2 insertions, 1 deletions
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", |