From: Dr. Stephen Henson Date: Fri, 30 May 2014 12:21:43 +0000 (+0100) Subject: Use correct digest when exporting keying material. X-Git-Tag: OpenSSL_1_0_2-beta2~185 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d;p=oweals%2Fopenssl.git Use correct digest when exporting keying material. PR#3319 (cherry picked from commit 84691390eae86befd33c83721dacedb539ae34e6) --- diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 1fe6731c31..4874e5f95d 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -1226,7 +1226,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST, TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1; - rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2, + rv = tls1_PRF(ssl_get_algorithm2(s), val, vallen, NULL, 0, NULL, 0,