1 files changed, 13 insertions, 13 deletions

diff --git a/cipher.c b/cipher.c
index 820bc6ace..8195199b3 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.114 2020/01/23 10:24:29 dtucker Exp $ */
+/* $OpenBSD: cipher.c,v 1.117 2020/04/03 04:27:03 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -59,7 +59,7 @@ struct sshcipher_ctx {
         int     plaintext;
         int     encrypt;
         EVP_CIPHER_CTX *evp;
-        struct chachapoly_ctx cp_ctx; /* XXX union with evp? */
+        struct chachapoly_ctx *cp_ctx;
         struct aesctr_ctx ac_ctx; /* XXX union with evp? */
         const struct sshcipher *cipher;
 };
@@ -273,7 +273,8 @@ cipher_init(struct sshcipher_ctx **ccp, const struct sshcipher *cipher,
 
         cc->cipher = cipher;
         if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) {
-                ret = chachapoly_init(&cc->cp_ctx, key, keylen);
+                cc->cp_ctx = chachapoly_new(key, keylen);
+                ret = cc->cp_ctx != NULL ? 0 : SSH_ERR_INVALID_ARGUMENT;
                 goto out;
         }
         if ((cc->cipher->flags & CFLAG_NONE) != 0) {
@@ -328,8 +329,7 @@ cipher_init(struct sshcipher_ctx **ccp, const struct sshcipher *cipher,
 #ifdef WITH_OPENSSL
                         EVP_CIPHER_CTX_free(cc->evp);
 #endif /* WITH_OPENSSL */
-                        explicit_bzero(cc, sizeof(*cc));
-                        free(cc);
+                        freezero(cc, sizeof(*cc));
                 }
         }
         return ret;
@@ -338,7 +338,7 @@ cipher_init(struct sshcipher_ctx **ccp, const struct sshcipher *cipher,
 /*
  * cipher_crypt() operates as following:
  * Copy 'aadlen' bytes (without en/decryption) from 'src' to 'dest'.
- * Theses bytes are treated as additional authenticated data for
+ * These bytes are treated as additional authenticated data for
  * authenticated encryption modes.
  * En/Decrypt 'len' bytes at offset 'aadlen' from 'src' to 'dest'.
  * Use 'authlen' bytes at offset 'len'+'aadlen' as the authentication tag.
@@ -350,7 +350,7 @@ cipher_crypt(struct sshcipher_ctx *cc, u_int seqnr, u_char *dest,
    const u_char *src, u_int len, u_int aadlen, u_int authlen)
 {
         if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) {
-                return chachapoly_crypt(&cc->cp_ctx, seqnr, dest, src,
+                return chachapoly_crypt(cc->cp_ctx, seqnr, dest, src,
                     len, aadlen, authlen, cc->encrypt);
         }
         if ((cc->cipher->flags & CFLAG_NONE) != 0) {
@@ -413,7 +413,7 @@ cipher_get_length(struct sshcipher_ctx *cc, u_int *plenp, u_int seqnr,
     const u_char *cp, u_int len)
 {
         if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0)
-                return chachapoly_get_length(&cc->cp_ctx, plenp, seqnr,
+                return chachapoly_get_length(cc->cp_ctx, plenp, seqnr,
                     cp, len);
         if (len < 4)
                 return SSH_ERR_MESSAGE_INCOMPLETE;
@@ -426,16 +426,16 @@ cipher_free(struct sshcipher_ctx *cc)
 {
         if (cc == NULL)
                 return;
-        if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0)
-                explicit_bzero(&cc->cp_ctx, sizeof(cc->cp_ctx));
-        else if ((cc->cipher->flags & CFLAG_AESCTR) != 0)
+        if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) {
+                chachapoly_free(cc->cp_ctx);
+                cc->cp_ctx = NULL;
+        } else if ((cc->cipher->flags & CFLAG_AESCTR) != 0)
                 explicit_bzero(&cc->ac_ctx, sizeof(cc->ac_ctx));
 #ifdef WITH_OPENSSL
         EVP_CIPHER_CTX_free(cc->evp);
         cc->evp = NULL;
 #endif
-        explicit_bzero(cc, sizeof(*cc));
-        free(cc);
+        freezero(cc, sizeof(*cc));
 }
 
 /*