svn commit: r286068 - in releng/8.4: . crypto/openssh sys/conf

[Xin LI]

Author: delphij
Date: Thu Jul 30 10:09:31 2015
New Revision: 286068
URL: https://svnweb.freebsd.org/changeset/base/286068

Log:
  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

Modified:
  releng/8.4/UPDATING
  releng/8.4/crypto/openssh/auth2-chall.c
  releng/8.4/sys/conf/newvers.sh

Modified: releng/8.4/UPDATING
==============================================================================
--- releng/8.4/UPDATING	Thu Jul 30 10:09:07 2015	(r286067)
+++ releng/8.4/UPDATING	Thu Jul 30 10:09:31 2015	(r286068)
@@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	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

Modified: releng/8.4/crypto/openssh/auth2-chall.c
==============================================================================
--- releng/8.4/crypto/openssh/auth2-chall.c	Thu Jul 30 10:09:07 2015	(r286067)
+++ releng/8.4/crypto/openssh/auth2-chall.c	Thu Jul 30 10:09:31 2015	(r286068)
@@ -131,6 +131,7 @@ kbdint_alloc(const char *devs)
 	kbdintctxt->ctxt = NULL;
 	kbdintctxt->device = NULL;
 	kbdintctxt->nreq = 0;
+	kbdintctxt->devices_done = 0;
 
 	return kbdintctxt;
 }

Modified: releng/8.4/sys/conf/newvers.sh
==============================================================================
--- releng/8.4/sys/conf/newvers.sh	Thu Jul 30 10:09:07 2015	(r286067)
+++ releng/8.4/sys/conf/newvers.sh	Thu Jul 30 10:09:31 2015	(r286068)
@@ -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