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 1fe6731c3104c9552ac92fbf45777b821e151054..4874e5f95deefc1f6ea80340180db7760a57bae5 100644 (file)
--- 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;
 
        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,
                      val, vallen,
                      NULL, 0,
                      NULL, 0,