From: jsing <jsing@openbsd.org>
Date: Fri, 31 Aug 2018 18:31:34 +0000 (+0000)
Subject: Remove unused argument to tls1_change_cipher_state_cipher().
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b894dda755907b15e585859d868c123aa8a70235;p=openbsd

Remove unused argument to tls1_change_cipher_state_cipher().
---

diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c
index 9598613516b..24fc8ede683 100644
--- a/lib/libssl/t1_enc.c
+++ b/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.109 2017/05/06 22:24:58 beck Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.110 2018/08/31 18:31:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -444,11 +444,10 @@ tls1_change_cipher_state_aead(SSL *s, char is_read, const unsigned char *key,
  * tls1_change_cipher_state_cipher performs the work needed to switch cipher
  * states when using EVP_CIPHER. The argument is_read is true iff this function
  * is being called due to reading, as opposed to writing, a ChangeCipherSpec
- * message. In order to support export ciphersuites, use_client_keys indicates
- * whether the key material provided is in the "client write" direction.
+ * message.
  */
 static int
-tls1_change_cipher_state_cipher(SSL *s, char is_read, char use_client_keys,
+tls1_change_cipher_state_cipher(SSL *s, char is_read,
     const unsigned char *mac_secret, unsigned int mac_secret_size,
     const unsigned char *key, unsigned int key_len, const unsigned char *iv,
     unsigned int iv_len)
@@ -560,7 +559,6 @@ tls1_change_cipher_state(SSL *s, int which)
 	const EVP_AEAD *aead;
 	char is_read, use_client_keys;
 
-
 	cipher = S3I(s)->tmp.new_sym_enc;
 	aead = S3I(s)->tmp.new_aead;
 
@@ -579,7 +577,6 @@ tls1_change_cipher_state(SSL *s, int which)
 	use_client_keys = ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
 	    (which == SSL3_CHANGE_CIPHER_SERVER_READ));
 
-
 	/*
 	 * Reset sequence number to zero - for DTLS this is handled in
 	 * dtls1_reset_seq_numbers().
@@ -645,7 +642,7 @@ tls1_change_cipher_state(SSL *s, int which)
 		    iv, iv_len);
 	}
 
-	return tls1_change_cipher_state_cipher(s, is_read, use_client_keys,
+	return tls1_change_cipher_state_cipher(s, is_read,
 	    mac_secret, mac_secret_size, key, key_len, iv, iv_len);
 
 err2: