summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/t1_enc.c
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-04-28 20:10:55 +0000
committertedu <tedu@openbsd.org>2014-04-28 20:10:55 +0000
commit83e195a88b11348250b6b70270db29249052e987 (patch)
tree3320ff7e29af4302383f11dfbaa80caf5b558e1b /lib/libssl/src/ssl/t1_enc.c
parentSSL_OP_ALL is supposed to be all options and workarounds that are safe, (diff)
downloadwireguard-openbsd-83e195a88b11348250b6b70270db29249052e987.tar.xz
wireguard-openbsd-83e195a88b11348250b6b70270db29249052e987.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 'lib/libssl/src/ssl/t1_enc.c')
-rw-r--r--lib/libssl/src/ssl/t1_enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/t1_enc.c b/lib/libssl/src/ssl/t1_enc.c
index ac503f53eeb..2480fecd7ee 100644
--- a/lib/libssl/src/ssl/t1_enc.c
+++ b/lib/libssl/src/ssl/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);