From 31d48da3177cee3d86dc48a53c9e8bea95bd3901 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 27 Mar 2016 20:07:53 +0100 Subject: [PATCH] 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. --- settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }, -- 2.45.2