upstream: Remove the pre-standardization cipher

rijndael-cbc@lysator.liu.se. It is an alias for aes256-cbc which was
standardized in RFC4253 (2006), has been deprecated and disabled by default
since OpenSSH 7.2 (2016) and was only briefly documented in ssh.1 in 2001.

This will reduce the amount of work the cipher/kex regression tests need
to do by a little bit.  ok markus@ djm@

OpenBSD-Commit-ID: fb460acc18290a998fd70910b19c29b4e4f199ad

diff --git a/cipher.c b/cipher.c
index 8195199b32a2d983e57e2779e9c0791c911649e0..639511cfdb1edd1ea2c8c49af217ec62840a0d13 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.117 2020/04/03 04:27:03 djm Exp $ */
+/* $OpenBSD: cipher.c,v 1.118 2020/12/21 11:09:32 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -91,8 +91,6 @@ static const struct sshcipher ciphers[] = {
        { "aes128-cbc",         16, 16, 0, 0, CFLAG_CBC, EVP_aes_128_cbc },
        { "aes192-cbc",         16, 24, 0, 0, CFLAG_CBC, EVP_aes_192_cbc },
        { "aes256-cbc",         16, 32, 0, 0, CFLAG_CBC, EVP_aes_256_cbc },
-       { "rijndael-cbc@lysator.liu.se",
-                               16, 32, 0, 0, CFLAG_CBC, EVP_aes_256_cbc },
        { "aes128-ctr",         16, 16, 0, 0, 0, EVP_aes_128_ctr },
        { "aes192-ctr",         16, 24, 0, 0, 0, EVP_aes_192_ctr },
        { "aes256-ctr",         16, 32, 0, 0, 0, EVP_aes_256_ctr },