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

diff --git a/compat.c b/compat.c
index 3d40f1a3d4a095a6a493d86e3a254e585096a4fd..ad04328d5b04889054b18e3d0178986adc485691 100644 (file)
--- 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. */

diff --git a/compat.h b/compat.h
index 9abe056dd5e8e2c2bc56d2f1d3021f6b810e9779..8d0ea2d688f66e821f9f0354f61b537383354fbc 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -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