From: djm <djm@openbsd.org>
Date: Mon, 1 May 2017 00:03:18 +0000 (+0000)
Subject: fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=18630ca8d05312e6a4d9ea61d0b794ca45a0c26e;p=openbsd

fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
it isn't really used for much anymore.
---

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 ||