| commit | caddf1c4deafcfbfdc7c9dc61f0fa29df61049b4 | [log] [tgz] |
|---|---|---|
| author | Adam Langley <agl@chromium.org> | Fri Jun 20 12:00:00 2014 -0700 |
| committer | Adam Langley <agl@chromium.org> | Fri Jun 20 13:17:40 2014 -0700 |
| tree | 29f3c472b4118e3a4341d97d6e0599ad6ff70d00 | |
| parent | 467c87e318c70699f22ca028c93af3f4b901db9e [diff] |
Use correct digest when exporting keying material. PR#3319 (Imported from upstream's 87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d)
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 95ecfaa..58640f8 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c
@@ -1438,7 +1438,7 @@ 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,