From caddf1c4deafcfbfdc7c9dc61f0fa29df61049b4 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Fri, 20 Jun 2014 12:00:00 -0700 Subject: [PATCH] Use correct digest when exporting keying material. PR#3319 (Imported from upstream's 87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d) --- ssl/t1_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 95ecfaad..58640f80 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -1438,7 +1438,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,