diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-02-17 03:06:18 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-02-17 15:43:54 +1100 |
| commit | 0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0 (patch) | |
| tree | a58bc85cb46bc6e576374f80d8b8dd50e627c908 | |
| parent | c81c2bea6e828d52b62b448b4ffdd3c163177975 (diff) | |
upstream: Remove now-unused compat bit SSH_BUG_BIGENDIANAES. This
was previously set for OpenSSH 2.3 (released in 2000) but this check was
removed in OpenSSH 7.7 (2018). ok djm@ deraadt@
OpenBSD-Commit-ID: 326426ea328707fc9e83305291ab135c87f678af
| -rw-r--r-- | compat.c | 12 | ||||
| -rw-r--r-- | compat.h | 4 |
2 files changed, 4 insertions, 12 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: compat.c,v 1.123 2023/02/16 10:10:00 dtucker Exp $ */ +/* $OpenBSD: compat.c,v 1.124 2023/02/17 03:06:18 dtucker Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -142,15 +142,7 @@ compat_banner(struct ssh *ssh, const char *version) char * compat_cipher_proposal(struct ssh *ssh, char *cipher_prop) { - if (!(ssh->compat & SSH_BUG_BIGENDIANAES)) - return xstrdup(cipher_prop); - debug2_f("original cipher proposal: %s", cipher_prop); - if ((cipher_prop = match_filter_denylist(cipher_prop, "aes*")) == NULL) - fatal("match_filter_denylist failed"); - debug2_f("compat cipher proposal: %s", cipher_prop); - if (*cipher_prop == '\0') - fatal("No supported ciphers found"); - return cipher_prop; + return xstrdup(cipher_prop); } /* Always returns pointer to allocated memory, caller must free. */ @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.h,v 1.59 2023/02/16 10:10:00 dtucker Exp $ */ +/* $OpenBSD: compat.h,v 1.60 2023/02/17 03:06:18 dtucker Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -39,7 +39,7 @@ /* #define unused 0x00000200 */ /* #define unused 0x00000400 */ #define SSH_BUG_SCANNER 0x00000800 -#define SSH_BUG_BIGENDIANAES 0x00001000 +/* #define unused 0x00001000 */ #define SSH_BUG_RSASIGMD5 0x00002000 #define SSH_OLD_DHGEX 0x00004000 #define SSH_BUG_NOREKEY 0x00008000 |