]> asedeno.scripts.mit.edu Git - PuTTY.git/blobdiff - ssh.c
Add the ChaCha20-Poly1305 cipher+MAC, as implemented by OpenSSH.
[PuTTY.git] / ssh.c
diff --git a/ssh.c b/ssh.c
index 1a069c26a3e2dc8ccfcbf8013f4ab3974c95184f..d89dfa3845322ca5df278bb8fc4f82a4c2b2cd72 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -6340,6 +6340,9 @@ static void do_ssh2_transport(Ssh ssh, const void *vin, int inlen,
              case CIPHER_ARCFOUR:
                s->preferred_ciphers[s->n_preferred_ciphers++] = &ssh2_arcfour;
                break;
+              case CIPHER_CHACHA20:
+                s->preferred_ciphers[s->n_preferred_ciphers++] = &ssh2_ccp;
+                break;
              case CIPHER_WARN:
                /* Flag for later. Don't bother if it's the last in
                 * the list. */