summaryrefslogtreecommitdiffstats
path: root/abs/core/openssh/keyboard-interactive.patch
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2015-08-05 14:51:38 (GMT)
committerBritney Fransen <brfransen@gmail.com>2015-08-05 14:51:38 (GMT)
commit35fbd73e89b879c24b0683b9faaaf38505131d43 (patch)
tree8eaf59dc8a9adc195793359823025f7da52c5fe8 /abs/core/openssh/keyboard-interactive.patch
parent49b546cbc42ebc01a6644e4cebb4a2674dfc5df8 (diff)
downloadlinhes_pkgbuild-35fbd73e89b879c24b0683b9faaaf38505131d43.zip
linhes_pkgbuild-35fbd73e89b879c24b0683b9faaaf38505131d43.tar.gz
linhes_pkgbuild-35fbd73e89b879c24b0683b9faaaf38505131d43.tar.bz2
openssh: update to 6.9p1
Diffstat (limited to 'abs/core/openssh/keyboard-interactive.patch')
-rw-r--r--abs/core/openssh/keyboard-interactive.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/abs/core/openssh/keyboard-interactive.patch b/abs/core/openssh/keyboard-interactive.patch
new file mode 100644
index 0000000..4adafeb
--- /dev/null
+++ b/abs/core/openssh/keyboard-interactive.patch
@@ -0,0 +1,52 @@
+From 5b64f85bb811246c59ebab70aed331f26ba37b18 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Sat, 18 Jul 2015 07:57:14 +0000
+Subject: upstream commit
+
+only query each keyboard-interactive device once per
+ authentication request regardless of how many times it is listed; ok markus@
+
+Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1
+---
+ auth2-chall.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/auth2-chall.c b/auth2-chall.c
+index ddabe1a..4aff09d 100644
+--- a/auth2-chall.c
++++ b/auth2-chall.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
++/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */
+ /*
+ * Copyright (c) 2001 Markus Friedl. All rights reserved.
+ * Copyright (c) 2001 Per Allansson. All rights reserved.
+@@ -83,6 +83,7 @@ struct KbdintAuthctxt
+ void *ctxt;
+ KbdintDevice *device;
+ u_int nreq;
++ u_int devices_done;
+ };
+
+ #ifdef USE_PAM
+@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt)
+ if (len == 0)
+ break;
+ for (i = 0; devices[i]; i++) {
+- if (!auth2_method_allowed(authctxt,
++ if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
++ !auth2_method_allowed(authctxt,
+ "keyboard-interactive", devices[i]->name))
+ continue;
+- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0)
++ if (strncmp(kbdintctxt->devices, devices[i]->name,
++ len) == 0) {
+ kbdintctxt->device = devices[i];
++ kbdintctxt->devices_done |= 1 << i;
++ }
+ }
+ t = kbdintctxt->devices;
+ kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL;
+--
+cgit v0.11.2
+