diff options
| author |   naddy <naddy@openbsd.org> | 2017-05-03 21:08:09 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2017-05-03 21:08:09 +0000 |
| commit | d6d98383b185fe01fa6c86505741cd6d1fc9580c (patch) | |
| tree | eb2fbba939d9d811a78a8cfc3346fc2e1abc1e86 /usr.bin/ssh/packet.c | |
| parent | Provide a function to dispose of a list of mbufs on dequeue (diff) | |
| download | wireguard-openbsd-d6d98383b185fe01fa6c86505741cd6d1fc9580c.tar.xz wireguard-openbsd-d6d98383b185fe01fa6c86505741cd6d1fc9580c.zip | |
remove miscellaneous SSH1 leftovers; ok markus@
Diffstat (limited to 'usr.bin/ssh/packet.c')
| -rw-r--r-- | usr.bin/ssh/packet.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c index 9f9ae926d84..eaba7f245df 100644 --- a/usr.bin/ssh/packet.c +++ b/usr.bin/ssh/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.252 2017/04/30 23:28:42 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.253 2017/05/03 21:08:09 naddy Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -178,10 +178,6 @@ struct session_state { u_int32_t rekey_interval; /* how often in seconds */ time_t rekey_time; /* time of last rekeying */ - /* Session key for protocol v1 */ - u_char ssh1_key[SSH_SESSION_KEY_LENGTH]; - u_int ssh1_keylen; - /* roundup current message to extra_pad bytes */ u_char extra_pad; @@ -272,8 +268,7 @@ ssh_packet_is_rekeying(struct ssh *ssh) } /* - * Sets the descriptors used for communication. Disables encryption until - * packet_set_encryption_key is called. + * Sets the descriptors used for communication. */ struct ssh * ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) @@ -785,18 +780,6 @@ uncompress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out) /* NOTREACHED */ } -/* - * Causes any further packets to be encrypted using the given key. The same - * key is used for both sending and reception. However, both directions are - * encrypted independently of each other. - */ - -void -ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number) -{ - fatal("no SSH protocol 1 support"); -} - int ssh_set_newkeys(struct ssh *ssh, int mode) { |