diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/t1_enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 42d384db7d..e3ffe0472e 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_enc.c,v 1.106 2017/03/25 13:36:56 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.107 2017/03/25 13:42:29 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1130,12 +1130,12 @@ tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, | |||
1130 | if (len < 0) | 1130 | if (len < 0) |
1131 | return 0; | 1131 | return 0; |
1132 | 1132 | ||
1133 | /* XXX - check return value. */ | 1133 | if (!tls1_PRF(s, p, len, |
1134 | tls1_PRF(s, p, len, | ||
1135 | TLS_MD_MASTER_SECRET_CONST, TLS_MD_MASTER_SECRET_CONST_SIZE, | 1134 | TLS_MD_MASTER_SECRET_CONST, TLS_MD_MASTER_SECRET_CONST_SIZE, |
1136 | s->s3->client_random, SSL3_RANDOM_SIZE, NULL, 0, | 1135 | s->s3->client_random, SSL3_RANDOM_SIZE, NULL, 0, |
1137 | s->s3->server_random, SSL3_RANDOM_SIZE, NULL, 0, | 1136 | s->s3->server_random, SSL3_RANDOM_SIZE, NULL, 0, |
1138 | s->session->master_key, SSL_MAX_MASTER_KEY_LENGTH); | 1137 | s->session->master_key, SSL_MAX_MASTER_KEY_LENGTH)) |
1138 | return 0; | ||
1139 | 1139 | ||
1140 | return (SSL_MAX_MASTER_KEY_LENGTH); | 1140 | return (SSL_MAX_MASTER_KEY_LENGTH); |
1141 | } | 1141 | } |