Use correct digest when exporting keying material.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 30 May 2014 12:21:43 +0000 (13:21 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 30 May 2014 12:24:36 +0000 (13:24 +0100)
PR#3319
(cherry picked from commit 84691390eae86befd33c83721dacedb539ae34e6)

ssl/t1_enc.c

index 1fe6731..4874e5f 100644 (file)
@@ -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,