From: Simon Tatham <anakin@pobox.com>
Date: Sun, 27 Mar 2016 19:07:53 +0000 (+0100)
Subject: Decide on a position for ChaCha20-Poly1305.
X-Git-Tag: 0.68~212
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=31d48da3177cee3d86dc48a53c9e8bea95bd3901;hp=ddb1fc15a15990036065c368ba243f8d5db853ef;p=PuTTY.git

Decide on a position for ChaCha20-Poly1305.

Previously, due to confusion, it was placed either at the end of the
list or at the start, depending on whether the user had any saved
configuration at all. Now we get to choose a sensible place for it in
the list, and for the moment I think second place behind AES is
reasonable.
---

diff --git a/settings.c b/settings.c
index b15839fa..b6146960 100644
--- a/settings.c
+++ b/settings.c
@@ -10,8 +10,8 @@
 
 /* The cipher order given here is the default order. */
 static const struct keyvalwhere ciphernames[] = {
-    { "chacha20",   CIPHER_CHACHA20,        -1, -1 },
     { "aes",        CIPHER_AES,             -1, -1 },
+    { "chacha20",   CIPHER_CHACHA20,        CIPHER_AES, +1 },
     { "blowfish",   CIPHER_BLOWFISH,        -1, -1 },
     { "3des",       CIPHER_3DES,            -1, -1 },
     { "WARN",       CIPHER_WARN,            -1, -1 },