diff options
| author |   dtucker <dtucker@openbsd.org> | 2020-12-21 11:09:32 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2020-12-21 11:09:32 +0000 |
| commit | cb2dd7fc8920583cd80d18a9d4bee955514804ff (patch) | |
| tree | 6183df5f345bbc4489e878af9c61af09f0ab19f3 /usr.bin/ssh/cipher.c | |
| parent | Always call endservent_r() after getservbyport_r(). (diff) | |
| download | wireguard-openbsd-cb2dd7fc8920583cd80d18a9d4bee955514804ff.tar.xz wireguard-openbsd-cb2dd7fc8920583cd80d18a9d4bee955514804ff.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/cipher.c')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index 06ac5a87618..553ac70254d 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/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 @@ -85,8 +85,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 }, |