summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-02-17 03:06:18 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-02-17 15:43:54 +1100
commit0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0 (patch)
treea58bc85cb46bc6e576374f80d8b8dd50e627c908 /compat.c
parentc81c2bea6e828d52b62b448b4ffdd3c163177975 (diff)
downloadopenssh-git-0833ccf2c8b7ae08b296c06f17bd53e3ab94b0b0.tar.gz
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
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/compat.c b/compat.c
index 3d40f1a3..ad04328d 100644
--- a/compat.c
+++ b/compat.c
@@ -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. */