summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-30 13:21:43 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-05-30 13:24:36 +0100
commit87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d (patch)
treee1fa88d36a4d1672d3accdc65b65b087c7d04ab3 /ssl
parentb5bdde9e0e40a3e1e543d6818c370cef4020d3cb (diff)
Use correct digest when exporting keying material.
PR#3319 (cherry picked from commit 84691390eae86befd33c83721dacedb539ae34e6)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/t1_enc.c2
1 files changed, 1 insertions, 1 deletions
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,