summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src
diff options
context:
space:
mode:
authortedu <>2014-04-28 20:10:55 +0000
committertedu <>2014-04-28 20:10:55 +0000
commit39f4a790c946d63805d314d963246640860e423d (patch)
treec2b5ecc85f67c5ed694e7f62e3cb70831e2e3439 /src/lib/libssl/src
parentcc747356aac23674ce2a3758570f3ff35a6fb3c9 (diff)
downloadopenbsd-39f4a790c946d63805d314d963246640860e423d.tar.gz
openbsd-39f4a790c946d63805d314d963246640860e423d.tar.bz2
openbsd-39f4a790c946d63805d314d963246640860e423d.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/src')
-rw-r--r--src/lib/libssl/src/ssl/t1_enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index ac503f53ee..2480fecd7e 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/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);