summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-10-12 14:21:13 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-10-12 14:21:13 +0000
commit6479bcf33c53caef0623455387a0e40e9a854a31 (patch)
tree56a4bb4505f39a67426c0abb815f899f31915121 /usr.bin/ssh
parent017586894651eba06eb435b5778575d169225b55 (diff)
remove unused
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/kex.h1
-rw-r--r--usr.bin/ssh/packet.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h
index 93c77cac062..21295813127 100644
--- a/usr.bin/ssh/kex.h
+++ b/usr.bin/ssh/kex.h
@@ -60,7 +60,6 @@ typedef struct Enc Enc;
struct Enc {
char *name;
- int type;
Cipher *cipher;
int enabled;
unsigned char *key;
diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index b5d692cf842..3216fdaf45e 100644
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.37 2000/10/11 20:27:23 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.38 2000/10/12 14:21:12 markus Exp $");
#include "xmalloc.h"
#include "buffer.h"
@@ -582,7 +582,7 @@ packet_send2()
if (padlen < 4)
padlen += block_size;
buffer_append_space(&outgoing_packet, &cp, padlen);
- if (enc && enc->type != SSH_CIPHER_NONE) {
+ if (enc && enc->cipher->number != SSH_CIPHER_NONE) {
/* random padding */
for (i = 0; i < padlen; i++) {
if (i % 4 == 0)