summaryrefslogtreecommitdiffstats
path: root/ssl/t1_enc.c
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-31 13:43:01 +0100
commit28e117f49f215df9bc8088de10b2bbd650de21ee (patch)
tree924c9d940df352795e2a118d3726d2c5d7af9000 /ssl/t1_enc.c
parent46bfc05480478e640d60aaf6ef09a2a913b15164 (diff)
Use correct digest when exporting keying material.
PR#3319 (cherry picked from commit 84691390eae86befd33c83721dacedb539ae34e6)
Diffstat (limited to 'ssl/t1_enc.c')
-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 5e05e93322..ac8c153996 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1181,7 +1181,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,