diff options
| author | Adam Langley <agl@chromium.org> | 2014-06-20 23:00:00 +0400 |
|---|---|---|
| committer | Adam Langley <agl@chromium.org> | 2014-06-21 00:17:40 +0400 |
| commit | caddf1c4deafcfbfdc7c9dc61f0fa29df61049b4 (patch) | |
| tree | 29f3c472b4118e3a4341d97d6e0599ad6ff70d00 /ssl/t1_enc.c | |
| parent | 467c87e318c70699f22ca028c93af3f4b901db9e (diff) | |
Use correct digest when exporting keying material.
PR#3319
(Imported from upstream's 87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d)
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 95ecfaad..58640f80 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -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, 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, |