From 307c298d1ff2bb1499ac7438b522582b7596cf71 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Sat, 7 Feb 2015 18:53:55 +0000
Subject: Remove useless variables and use the values directly.

From OpenSSL commit 3d47c1d331fdc7574d2275cda1a630ccdb624b08.

ok miod@, jsing@
---
 src/lib/libssl/src/ssl/t1_enc.c | 8 +++-----
 src/lib/libssl/t1_enc.c         | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index 3b7e625db3..f7c4bc8dde 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/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);
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 3b7e625db3..f7c4bc8dde 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/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);
-- 
cgit v1.2.3-55-g6feb