fixup setting ciphercontext->plaintext (lost in SSHv1 purge), though
authordjm <djm@openbsd.org>
Mon, 1 May 2017 00:03:18 +0000 (00:03 +0000)
committerdjm <djm@openbsd.org>
Mon, 1 May 2017 00:03:18 +0000 (00:03 +0000)
it isn't really used for much anymore.

usr.bin/ssh/cipher.c

index c1d628c..4cde43c 100644 (file)
@@ -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 ||