svn commit: r326721 - stable/10/crypto/openssl/ssl

[Gordon Tetlow]

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