From owner-svn-src-all@freebsd.org Thu Jul 30 10:09:33 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 644989AB1AB; Thu, 30 Jul 2015 10:09:33 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B9331112; Thu, 30 Jul 2015 10:09:33 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6UA9Xlj059490; Thu, 30 Jul 2015 10:09:33 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6UA9WF5059486; Thu, 30 Jul 2015 10:09:32 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201507301009.t6UA9WF5059486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 30 Jul 2015 10:09:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r286068 - in releng/8.4: . crypto/openssh sys/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 10:09:33 -0000 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