summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2018-08-31 18:31:34 +0000
committerjsing <>2018-08-31 18:31:34 +0000
commitd84ad12fc92f31c54b52b202768bcd84f06077b5 (patch)
tree25748008eb844536caee969a12242de42bc8644b /src
parentacc1581448c8aafe2e75f0ad04bf4fd54accfdac (diff)
downloadopenbsd-d84ad12fc92f31c54b52b202768bcd84f06077b5.tar.gz
openbsd-d84ad12fc92f31c54b52b202768bcd84f06077b5.tar.bz2
openbsd-d84ad12fc92f31c54b52b202768bcd84f06077b5.zip
Remove unused argument to tls1_change_cipher_state_cipher().
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/t1_enc.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 9598613516..24fc8ede68 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.109 2017/05/06 22:24:58 beck Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.110 2018/08/31 18:31:34 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 *
@@ -444,11 +444,10 @@ tls1_change_cipher_state_aead(SSL *s, char is_read, const unsigned char *key,
444 * tls1_change_cipher_state_cipher performs the work needed to switch cipher 444 * tls1_change_cipher_state_cipher performs the work needed to switch cipher
445 * states when using EVP_CIPHER. The argument is_read is true iff this function 445 * states when using EVP_CIPHER. The argument is_read is true iff this function
446 * is being called due to reading, as opposed to writing, a ChangeCipherSpec 446 * is being called due to reading, as opposed to writing, a ChangeCipherSpec
447 * message. In order to support export ciphersuites, use_client_keys indicates 447 * message.
448 * whether the key material provided is in the "client write" direction.
449 */ 448 */
450static int 449static int
451tls1_change_cipher_state_cipher(SSL *s, char is_read, char use_client_keys, 450tls1_change_cipher_state_cipher(SSL *s, char is_read,
452 const unsigned char *mac_secret, unsigned int mac_secret_size, 451 const unsigned char *mac_secret, unsigned int mac_secret_size,
453 const unsigned char *key, unsigned int key_len, const unsigned char *iv, 452 const unsigned char *key, unsigned int key_len, const unsigned char *iv,
454 unsigned int iv_len) 453 unsigned int iv_len)
@@ -560,7 +559,6 @@ tls1_change_cipher_state(SSL *s, int which)
560 const EVP_AEAD *aead; 559 const EVP_AEAD *aead;
561 char is_read, use_client_keys; 560 char is_read, use_client_keys;
562 561
563
564 cipher = S3I(s)->tmp.new_sym_enc; 562 cipher = S3I(s)->tmp.new_sym_enc;
565 aead = S3I(s)->tmp.new_aead; 563 aead = S3I(s)->tmp.new_aead;
566 564
@@ -579,7 +577,6 @@ tls1_change_cipher_state(SSL *s, int which)
579 use_client_keys = ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) || 577 use_client_keys = ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
580 (which == SSL3_CHANGE_CIPHER_SERVER_READ)); 578 (which == SSL3_CHANGE_CIPHER_SERVER_READ));
581 579
582
583 /* 580 /*
584 * Reset sequence number to zero - for DTLS this is handled in 581 * Reset sequence number to zero - for DTLS this is handled in
585 * dtls1_reset_seq_numbers(). 582 * dtls1_reset_seq_numbers().
@@ -645,7 +642,7 @@ tls1_change_cipher_state(SSL *s, int which)
645 iv, iv_len); 642 iv, iv_len);
646 } 643 }
647 644
648 return tls1_change_cipher_state_cipher(s, is_read, use_client_keys, 645 return tls1_change_cipher_state_cipher(s, is_read,
649 mac_secret, mac_secret_size, key, key_len, iv, iv_len); 646 mac_secret, mac_secret_size, key, key_len, iv, iv_len);
650 647
651err2: 648err2: