diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-28 20:10:56 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-28 20:10:56 +0000 |
| commit | 92b1f4c5d3fc669c9e5d172ca284a39e79d9ebbd (patch) | |
| tree | ae4659cd5e562a7803d46381d2053b99a4282f08 /lib/libssl | |
| parent | adc9526f38f8340ab33b622ff4bda39afdd348d8 (diff) | |
use the correct algorithm mask. reported by satish lvr via
http://marc.info/?l=openssl-dev&m=139779977532459&w=2
ok miod
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/t1_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index ac503f53eeb..2480fecd7ee 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1124,7 +1124,7 @@ tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, 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, NULL, 0, NULL, 0, s->session->master_key, s->session->master_key_length, out, buff, olen); |