diff options
| author | Doug Hogan <doug@cvs.openbsd.org> | 2015-02-07 18:53:56 +0000 |
|---|---|---|
| committer | Doug Hogan <doug@cvs.openbsd.org> | 2015-02-07 18:53:56 +0000 |
| commit | de2d98f82616db9ef5a8e36bd7c53b5684478563 (patch) | |
| tree | fd4dc31f4f01cf3d36f7afd26e739e50d03b261b /lib/libssl/t1_enc.c | |
| parent | f40cb8636ead2f8c7b40bedc78f6221fba79cbca (diff) | |
Remove useless variables and use the values directly.
From OpenSSL commit 3d47c1d331fdc7574d2275cda1a630ccdb624b08.
ok miod@, jsing@
Diffstat (limited to 'lib/libssl/t1_enc.c')
| -rw-r--r-- | lib/libssl/t1_enc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index 3b7e625db33..f7c4bc8dde5 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.75 2014/12/15 00:46:53 doug Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.76 2015/02/07 18:53:55 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1082,13 +1082,11 @@ tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, int len) { unsigned char buff[SSL_MAX_MASTER_KEY_LENGTH]; - const void *co = NULL, *so = NULL; - int col = 0, sol = 0; tls1_PRF(ssl_get_algorithm2(s), TLS_MD_MASTER_SECRET_CONST, TLS_MD_MASTER_SECRET_CONST_SIZE, - s->s3->client_random, SSL3_RANDOM_SIZE, co, col, - s->s3->server_random, SSL3_RANDOM_SIZE, so, sol, + s->s3->client_random, SSL3_RANDOM_SIZE, NULL, 0, + s->s3->server_random, SSL3_RANDOM_SIZE, NULL, 0, p, len, s->session->master_key, buff, sizeof buff); return (SSL3_MASTER_SECRET_SIZE); |