From 554a1309dbd71bb59ed4e97ea5e0bc829dad0f04 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Thu, 30 Jul 2015 10:09:31 +0000 Subject: Fix a regression introduced with previous SA-15:16.openssl changeset. The problem is specific to FreeBSD 8.x. Submitted by: jkim Pointy hat to: delphij Approved by: so --- UPDATING | 4 ++++ crypto/openssh/auth2-chall.c | 1 + sys/conf/newvers.sh | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index a8ec17af720d..803fe2bde322 100644 --- a/UPDATING +++ b/UPDATING @@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V: debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20150730: p36 FreeBSD-SA-15:16.openssh [REVISED] + Fix a regression introduced in SA-15:16 patch that would break + keyboard-interactive authentication. + 20150728: p35 FreeBSD-SA-15:15.tcp FreeBSD-SA-15:16.openssh FreeBSD-SA-15:17.bind diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c index e5f6d67f5046..482e6c350059 100644 --- a/crypto/openssh/auth2-chall.c +++ b/crypto/openssh/auth2-chall.c @@ -131,6 +131,7 @@ kbdint_alloc(const char *devs) kbdintctxt->ctxt = NULL; kbdintctxt->device = NULL; kbdintctxt->nreq = 0; + kbdintctxt->devices_done = 0; return kbdintctxt; } diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 9db505b403bb..7fb64a982103 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.4" -BRANCH="RELEASE-p35" +BRANCH="RELEASE-p36" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi -- cgit v1.3