From owner-svn-src-all@freebsd.org  Sat Dec  9 03:41:32 2017
Return-Path: <owner-svn-src-all@freebsd.org>
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 76A80E9C3F4;
 Sat,  9 Dec 2017 03:41:32 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 3C66572EEB;
 Sat,  9 Dec 2017 03:41:32 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB93fVS8091557;
 Sat, 9 Dec 2017 03:41:31 GMT (envelope-from gordon@FreeBSD.org)
Received: (from gordon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB93fV85091556;
 Sat, 9 Dec 2017 03:41:31 GMT (envelope-from gordon@FreeBSD.org)
Message-Id: <201712090341.vB93fV85091556@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gordon set sender to
 gordon@FreeBSD.org using -f
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sat, 9 Dec 2017 03:41:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326721 - stable/10/crypto/openssl/ssl
X-SVN-Group: stable-10
X-SVN-Commit-Author: gordon
X-SVN-Commit-Paths: stable/10/crypto/openssl/ssl
X-SVN-Commit-Revision: 326721
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Dec 2017 03:41:32 -0000

Author: gordon
Date: Sat Dec  9 03:41:31 2017
New Revision: 326721
URL: https://svnweb.freebsd.org/changeset/base/326721

Log:
  Fix error state handling.
  
  Security:	CVE-2017-3737
  Security:	FreeBSD-SA-17:12.openssl

Modified:
  stable/10/crypto/openssl/ssl/ssl.h

Modified: stable/10/crypto/openssl/ssl/ssl.h
==============================================================================
--- stable/10/crypto/openssl/ssl/ssl.h	Fri Dec  8 22:19:41 2017	(r326720)
+++ stable/10/crypto/openssl/ssl/ssl.h	Sat Dec  9 03:41:31 2017	(r326721)
@@ -1544,7 +1544,7 @@ extern "C" {
 # define SSL_ST_BEFORE                   0x4000
 # define SSL_ST_OK                       0x03
 # define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
-# define SSL_ST_ERR                      0x05
+# define SSL_ST_ERR                      (0x05|SSL_ST_INIT)
 
 # define SSL_CB_LOOP                     0x01
 # define SSL_CB_EXIT                     0x02