4 files changed, 6 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b03040..9a797ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ LibreSSL Portable Release Notes:
           - Rewrote and simplified bn_sqr().
           - Removed EC_GROUP precomp machinery.
           - Ensure no X.509v3 extensions appear more than once in certificates.
+          - Cleaned up various ECDH, ECDSA and EC internals.
         * New features
         * Compatibility changes
           - X509_NAME_get_text_by_{NID,OBJ}() now only succeed if they contain
@@ -68,6 +69,9 @@ LibreSSL Portable Release Notes:
         * Testing and Proactive Security
           - As always, new test coverage is added as bugs are fixed and subsystems
             are cleaned up.
+        * Security fixes
+          - Disabled TLSv1.0 and TLSv1.1 in libssl so that they may no longer
+            be selected for use.
 
 3.8.0 - Development release
 
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 0379899..707424c 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -111,6 +111,7 @@ if(HOST_ASM_MACOSX_X86_64)
                 bn/arch/amd64/word_clz.S
                 bn/arch/amd64/bn_arch.c
         )
+        add_definitions(-Dendbr64=)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index b9b89cf..219a7ac 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -34,6 +34,7 @@ ASM_X86_64_MACOSX += bn/arch/amd64/bn_arch.c
 EXTRA_DIST += $(ASM_X86_64_MACOSX)
 
 if HOST_ASM_MACOSX_X86_64
+libcrypto_la_CPPFLAGS += -Dendbr64=
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
diff --git a/update.sh b/update.sh
index abf2097..d42cd58 100755
--- a/update.sh
+++ b/update.sh
@@ -194,11 +194,6 @@ fixup_masm() {
                 > $2
 }
 
-fixup_macosx() {
-        echo Fixing up $2
-        sed -e 's/endbr64//' $1 > $2
-}
-
 # generate assembly crypto algorithms
 asm_src=$libcrypto_src
 gen_asm_stdout() {
@@ -210,8 +205,6 @@ gen_asm_stdout() {
         EOF
         if [ $1 = "masm" ]; then
                 fixup_masm crypto/$3.tmp crypto/$3
-        elif [ $1 = "macosx" ]; then
-                fixup_macosx crypto/$3.tmp crypto/$3
         else
                 $MV crypto/$3.tmp crypto/$3
         fi
@@ -238,8 +231,6 @@ gen_asm() {
         EOF
         if [ $1 = "masm" ]; then
                 fixup_masm crypto/$3.tmp crypto/$3
-        elif [ $1 = "macosx" ]; then
-                fixup_macosx crypto/$3.tmp crypto/$3
         else
                 $MV crypto/$3.tmp crypto/$3
         fi