summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-05-01 00:03:18 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 10:06:24 +1000
commite77e1562716fb3da413e4c2397811017b762f5e3 (patch)
tree3e0c5dc8e050a1498cf53e6afd7cf06f3fc215a0
parentf7849e6c83a4e0f602dea6c834a24091c622d68e (diff)
upstream commit
fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though it isn't really used for much anymore. Upstream-ID: 859b8bce84ff4865b32097db5430349d04b9b747
-rw-r--r--cipher.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher.c b/cipher.c
index 622e745d..7d72084f 100644
--- a/cipher.c
+++ b/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
@@ -259,7 +259,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 ||