Use correct digest when exporting keying material.

PR#3319

(Imported from upstream's 87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d)
This commit is contained in:
Adam Langley 2014-06-20 12:00:00 -07:00
parent 467c87e318
commit caddf1c4de

View File

@ -1438,7 +1438,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST, if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST,
TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1; 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, val, vallen,
NULL, 0, NULL, 0,
NULL, 0, NULL, 0,