Merge branch 'libressl:master' into patch-1

4 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 20d185c..1230099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,11 +71,17 @@ LibreSSL Portable Release Notes:
           - Added support for TLS PRF in the EVP KDF API.
           - Cleaned up cipher handling in SSL_SESSION.
           - Removed get_cipher from SSL_METHOD.
+          - Rewrote CRYPTO_EX_DATA from scratch. The only intentional change of
+            behavior is that there is now a hard limit on the number of indexes
+            that can be allocated.
         * Documentation improvements
           - Removed documentation of no longer existing API.
         * Testing and proactive security
           - Switched the remaining tests to new certs.
         * Compatibility changes
+          - Protocol parsing in libtls was changed. The no longer supported
+            TLSv1.1 and TLSv1.0 protocols are now completely ignored and no
+            longer enable or disable TLSv1.2 in surprising ways.
           - The one-step hashing functions, MD4(), MD5(), RIPEMD160(), SHA1(),
             all SHA-2, and HMAC() no longer support returning a static buffer.
             Callers must pass in a correctly sized buffer.
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 5ee20ff..7d4ff70 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -221,9 +221,9 @@ set(
         ${CRYPTO_SRC}
         cpt_err.c
         cryptlib.c
+        crypto_ex_data.c
         crypto_init.c
         cversion.c
-        ex_data.c
         malloc-wrapper.c
         mem_clr.c
         mem_dbg.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 6e1e975..cb463fb 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -203,6 +203,7 @@ endif
 
 libcrypto_la_SOURCES += cpt_err.c
 libcrypto_la_SOURCES += cryptlib.c
+libcrypto_la_SOURCES += crypto_ex_data.c
 libcrypto_la_SOURCES += crypto_init.c
 if !HOST_WIN
 libcrypto_la_SOURCES += crypto_lock.c
@@ -210,7 +211,6 @@ else
 libcrypto_la_SOURCES += compat/crypto_lock_win.c
 endif
 libcrypto_la_SOURCES += cversion.c
-libcrypto_la_SOURCES += ex_data.c
 libcrypto_la_SOURCES += malloc-wrapper.c
 libcrypto_la_SOURCES += mem_clr.c
 libcrypto_la_SOURCES += mem_dbg.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d81d012..f79f69e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -676,7 +676,7 @@ set_tests_properties(shutdowntest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_D
 # Emscripten does not support socketpair syscall.
 if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN))
         set(SIGNERTEST_SRC signertest.c)
-        check_function_exists(pipe2 HAVE_PIPE2)
+        check_symbol_exists(pipe2 "fcntl.h unistd.h" HAVE_PIPE2)
         if(HAVE_PIPE2)
                 add_definitions(-DHAVE_PIPE2)
         else()
@@ -792,7 +792,7 @@ add_platform_test(tlslegacytest tlslegacytest)
 # Emscripten does not support socketpair syscall.
 if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN))
         set(TLSTEST_SRC tlstest.c)
-        check_function_exists(pipe2 HAVE_PIPE2)
+        check_symbol_exists(pipe2 "fcntl.h unistd.h" HAVE_PIPE2)
         if(HAVE_PIPE2)
                 add_definitions(-DHAVE_PIPE2)
         else()