From 491ced77fa72fcec5b39051ff934a325810e0dd9 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Mon, 28 Apr 2014 20:10:55 +0000 Subject: use the correct algorithm mask. reported by satish lvr via http://marc.info/?l=openssl-dev&m=139779977532459&w=2 ok miod --- src/lib/libssl/t1_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/libssl/t1_enc.c') diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index ac503f53ee..2480fecd7e 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c @@ -1124,7 +1124,7 @@ tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, 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, NULL, 0, NULL, 0, s->session->master_key, s->session->master_key_length, out, buff, olen); -- cgit v1.2.3-55-g6feb