From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 1 May 2017 00:03:18 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_6_P1~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e77e1562716fb3da413e4c2397811017b762f5e3;p=thirdparty%2Fopenssh-portable.git

upstream commit

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

Upstream-ID: 859b8bce84ff4865b32097db5430349d04b9b747
---

diff --git a/cipher.c b/cipher.c
index 622e745d0..7d72084ff 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 ||