diff options
| author |   sf <sf@openbsd.org> | 2018-07-06 09:03:02 +0000 |
|---|---|---|
| committer | sf <sf@openbsd.org> | 2018-07-06 09:03:02 +0000 |
| commit | e260cbad5bc4d466763eee88277bdedb720a327c (patch) | |
| tree | 648bad83d8454a2025f65f2d46ee6f03601f919f | |
| parent | Fix efiboot not to panic when a serial which does not exist actually (diff) | |
| download | wireguard-openbsd-e260cbad5bc4d466763eee88277bdedb720a327c.tar.xz wireguard-openbsd-e260cbad5bc4d466763eee88277bdedb720a327c.zip | |
Remove unused ssh_packet_start_compression()
ok markus@
| -rw-r--r-- | usr.bin/ssh/opacket.h | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/packet.c | 23 | ||||
| -rw-r--r-- | usr.bin/ssh/packet.h | 3 |
3 files changed, 3 insertions, 27 deletions
diff --git a/usr.bin/ssh/opacket.h b/usr.bin/ssh/opacket.h index 9d11618ece8..c6e51248feb 100644 --- a/usr.bin/ssh/opacket.h +++ b/usr.bin/ssh/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/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 4dbb6dbdef6..3bff73ca6c5 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/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@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -141,12 +141,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; @@ -706,21 +700,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/usr.bin/ssh/packet.h b/usr.bin/ssh/packet.h index f0af467f2e5..6d270c33947 100644 --- a/usr.bin/ssh/packet.h +++ b/usr.bin/ssh/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@cs.hut.fi> @@ -93,7 +93,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 *); |