]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Relax array check slightly. Prevents compiler warnings github-selfhosted/master github/master
authordtucker@openbsd.org <dtucker@openbsd.org>
Thu, 2 Oct 2025 08:38:43 +0000 (08:38 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 2 Oct 2025 09:04:38 +0000 (19:04 +1000)
in -portable when there are no kbdint devices present.  ok djm@

OpenBSD-Commit-ID: c1c050cecd642d6073c792201908fd225191df93

auth2-chall.c

index bc2482a03a646f04e928bf65d31393255812fd57..a6d916598263ccc9b1d4eefc287fd433781e1b73 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.56 2025/09/29 21:37:52 dtucker Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.57 2025/10/02 08:38:43 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -166,7 +166,7 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt)
                        break;
                for (i = 0; devices[i]; i++) {
                        if (i >= sizeof(kbdintctxt->devices_done) * 8 ||
-                           i >= sizeof(devices) / sizeof(devices[0]) - 1)
+                           i >= sizeof(devices) / sizeof(devices[0]))
                                fatal_f("internal error: too may devices");
                        if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
                            !auth2_method_allowed(authctxt,