diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2017-05-01 00:03:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2017-05-01 00:03:19 +0000 |
| commit | 8b0d9af4608f6567a612edf84988e3c6593e299d (patch) | |
| tree | e3dfe18eba8b725f104dbb6d17320cfd472ecb7a /usr.bin/ssh | |
| parent | 3bbabbe60594d5025a78f504da5ac76e6a7f43ff (diff) | |
fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
it isn't really used for much anymore.
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index c1d628c9812..4cde43ce863 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/cipher.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.104 2017/04/30 23:15:04 djm Exp $ */ +/* $OpenBSD: cipher.c,v 1.105 2017/05/01 00:03:18 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -247,7 +247,7 @@ cipher_init(struct sshcipher_ctx **ccp, const struct sshcipher *cipher, if ((cc = calloc(sizeof(*cc), 1)) == NULL) return SSH_ERR_ALLOC_FAIL; - cc->plaintext = 0; /* XXX */ + cc->plaintext = (cipher->flags & CFLAG_NONE) != 0; cc->encrypt = do_encrypt; if (keylen < cipher->key_len || |