diff options
| author |   jsing <jsing@openbsd.org> | 2017-03-25 13:42:29 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-03-25 13:42:29 +0000 |
| commit | ce492ce0ec22691a559134f286ab8c5ddb203256 (patch) | |
| tree | 2d1fd9281d66beba2f5a9ddec72d32a279b3b77e /lib/libssl/t1_enc.c | |
| parent | Update regress to match changes to tls1_PRF(). (diff) | |
| download | wireguard-openbsd-ce492ce0ec22691a559134f286ab8c5ddb203256.tar.xz wireguard-openbsd-ce492ce0ec22691a559134f286ab8c5ddb203256.zip | |
Check tls1_PRF() return value in tls1_generate_master_secret().
Diffstat (limited to 'lib/libssl/t1_enc.c')
| -rw-r--r-- | lib/libssl/t1_enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index 42d384db7da..e3ffe0472ee 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.106 2017/03/25 13:36:56 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.107 2017/03/25 13:42:29 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1130,12 +1130,12 @@ tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, if (len < 0) return 0; - /* XXX - check return value. */ - tls1_PRF(s, p, len, + if (!tls1_PRF(s, p, len, TLS_MD_MASTER_SECRET_CONST, TLS_MD_MASTER_SECRET_CONST_SIZE, s->s3->client_random, SSL3_RANDOM_SIZE, NULL, 0, s->s3->server_random, SSL3_RANDOM_SIZE, NULL, 0, - s->session->master_key, SSL_MAX_MASTER_KEY_LENGTH); + s->session->master_key, SSL_MAX_MASTER_KEY_LENGTH)) + return 0; return (SSL_MAX_MASTER_KEY_LENGTH); } |