[openssh-commits] [openssh] 01/19: upstream: Remove unused ssh_packet_start_compression()

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit f28a4d5cd24c4aa177e96b4f96957991e552cb70
Author: sf at openbsd.org <sf at openbsd.org>
Date:   Fri Jul 6 09:03:02 2018 +0000

    upstream: Remove unused ssh_packet_start_compression()
    
    ok markus@
    
    OpenBSD-Commit-ID: 9d34cf2f59aca5422021ae2857190578187dc2b4
---
 opacket.h |  4 +---
 packet.c  | 23 +----------------------
 packet.h  |  3 +--
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/opacket.h b/opacket.h
index b2c2e7f6..f92fe586 100644
--- a/opacket.h
+++ b/opacket.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: opacket.h,v 1.12 2017/10/20 01:56:39 djm Exp $ */
+/* $OpenBSD: opacket.h,v 1.13 2018/07/06 09:03:02 sf Exp $ */
 #ifndef _OPACKET_H
 /* Written by Markus Friedl. Placed in the public domain.  */
 
@@ -59,8 +59,6 @@ void	 packet_read_expect(int expected_type);
 	ssh_packet_set_protocol_flags(active_state, (protocol_flags))
 #define packet_get_protocol_flags() \
 	ssh_packet_get_protocol_flags(active_state)
-#define packet_start_compression(level) \
-	ssh_packet_start_compression(active_state, (level))
 #define packet_start(type) \
 	ssh_packet_start(active_state, (type))
 #define packet_put_char(value) \
diff --git a/packet.c b/packet.c
index ab9a391b..4da9f52b 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.271 2018/06/01 04:05:29 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.272 2018/07/06 09:03:02 sf Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -147,12 +147,6 @@ struct session_state {
 	int compression_in_failures;
 	int compression_out_failures;
 
-	/*
-	 * Flag indicating whether packet compression/decompression is
-	 * enabled.
-	 */
-	int packet_compression;
-
 	/* default maximum packet size */
 	u_int max_packet_size;
 
@@ -717,21 +711,6 @@ start_compression_in(struct ssh *ssh)
 	return 0;
 }
 
-int
-ssh_packet_start_compression(struct ssh *ssh, int level)
-{
-	int r;
-
-	if (ssh->state->packet_compression)
-		return SSH_ERR_INTERNAL_ERROR;
-	ssh->state->packet_compression = 1;
-	if ((r = ssh_packet_init_compression(ssh)) != 0 ||
-	    (r = start_compression_in(ssh)) != 0 ||
-	    (r = start_compression_out(ssh, level)) != 0)
-		return r;
-	return 0;
-}
-
 /* XXX remove need for separate compression buffer */
 static int
 compress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out)
diff --git a/packet.h b/packet.h
index a2ece678..bf9aebdb 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.84 2017/12/10 05:55:29 dtucker Exp $ */
+/* $OpenBSD: packet.h,v 1.85 2018/07/06 09:03:02 sf Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -107,7 +107,6 @@ void	 ssh_clear_newkeys(struct ssh *, int);
 int	 ssh_packet_is_rekeying(struct ssh *);
 void     ssh_packet_set_protocol_flags(struct ssh *, u_int);
 u_int	 ssh_packet_get_protocol_flags(struct ssh *);
-int      ssh_packet_start_compression(struct ssh *, int);
 void	 ssh_packet_set_tos(struct ssh *, int);
 void     ssh_packet_set_interactive(struct ssh *, int, int, int);
 int      ssh_packet_is_interactive(struct ssh *);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.