diff options
author | tedu <> | 2014-04-28 20:10:55 +0000 |
---|---|---|
committer | tedu <> | 2014-04-28 20:10:55 +0000 |
commit | 491ced77fa72fcec5b39051ff934a325810e0dd9 (patch) | |
tree | c2b5ecc85f67c5ed694e7f62e3cb70831e2e3439 /src/lib/libssl/t1_enc.c | |
parent | 1930e571259f12d9779f43a180c86db18518919c (diff) | |
download | openbsd-491ced77fa72fcec5b39051ff934a325810e0dd9.tar.gz openbsd-491ced77fa72fcec5b39051ff934a325810e0dd9.tar.bz2 openbsd-491ced77fa72fcec5b39051ff934a325810e0dd9.zip |
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 'src/lib/libssl/t1_enc.c')
-rw-r--r-- | src/lib/libssl/t1_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index ac503f53ee..2480fecd7e 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1124,7 +1124,7 @@ tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, | |||
1124 | TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) | 1124 | TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) |
1125 | goto err1; | 1125 | goto err1; |
1126 | 1126 | ||
1127 | rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2, | 1127 | rv = tls1_PRF(ssl_get_algorithm2(s), |
1128 | val, vallen, NULL, 0, NULL, 0, NULL, 0, NULL, 0, | 1128 | val, vallen, NULL, 0, NULL, 0, NULL, 0, NULL, 0, |
1129 | s->session->master_key, s->session->master_key_length, | 1129 | s->session->master_key, s->session->master_key_length, |
1130 | out, buff, olen); | 1130 | out, buff, olen); |