aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-07-30 10:09:31 +0000
committerXin LI <delphij@FreeBSD.org>2015-07-30 10:09:31 +0000
commit554a1309dbd71bb59ed4e97ea5e0bc829dad0f04 (patch)
tree3e241aa1acdd0d601bdac59227cd29fdf356fe78
parentb768bf90231687be0e762c2e523a20c0e3cd711d (diff)
downloadsrc-releng/8.4.tar.gz
src-releng/8.4.zip
Fix a regression introduced with previous SA-15:16.opensslreleng/8.4
changeset. The problem is specific to FreeBSD 8.x. Submitted by: jkim Pointy hat to: delphij Approved by: so
Notes
Notes: svn path=/releng/8.4/; revision=286068
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssh/auth2-chall.c1
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 6 insertions, 1 deletions
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