diff options
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 20 | ||||
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | crypto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | crypto/Makefile.am.mingw64-x86_64 | 1 | ||||
-rwxr-xr-x | update.sh | 2 |
5 files changed, 18 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01a42fb..95fe601 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -509,9 +509,7 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
509 | "${CMAKE_CURRENT_BINARY_DIR}/LibreSSLConfigVersion.cmake" | 509 | "${CMAKE_CURRENT_BINARY_DIR}/LibreSSLConfigVersion.cmake" |
510 | DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}" | 510 | DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}" |
511 | ) | 511 | ) |
512 | endif() | ||
513 | 512 | ||
514 | if(ENABLE_LIBRESSL_INSTALL) | ||
515 | if(NOT MSVC) | 513 | if(NOT MSVC) |
516 | # Create pkgconfig files. | 514 | # Create pkgconfig files. |
517 | set(prefix ${CMAKE_INSTALL_PREFIX}) | 515 | set(prefix ${CMAKE_INSTALL_PREFIX}) |
@@ -530,19 +528,17 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
530 | install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig | 528 | install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig |
531 | DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 529 | DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
532 | endif() | 530 | endif() |
533 | endif(ENABLE_LIBRESSL_INSTALL) | ||
534 | 531 | ||
535 | if(ENABLE_LIBRESSL_INSTALL) | ||
536 | install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR}) | 532 | install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR}) |
537 | install(DIRECTORY DESTINATION ${CONF_DIR}/certs) | 533 | install(DIRECTORY DESTINATION ${CONF_DIR}/certs) |
538 | endif(ENABLE_LIBRESSL_INSTALL) | ||
539 | 534 | ||
540 | if(NOT TARGET uninstall) | 535 | if(NOT TARGET uninstall) |
541 | configure_file( | 536 | configure_file( |
542 | "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" | 537 | "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" |
543 | "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" | 538 | "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" |
544 | IMMEDIATE @ONLY) | 539 | IMMEDIATE @ONLY) |
545 | 540 | ||
546 | add_custom_target(uninstall | 541 | add_custom_target(uninstall |
547 | COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) | 542 | COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) |
543 | endif() | ||
548 | endif() | 544 | endif() |
@@ -54,6 +54,13 @@ LibreSSL Portable Release Notes: | |||
54 | * Compatibility changes | 54 | * Compatibility changes |
55 | - Removed workaround for F5 middle boxes. | 55 | - Removed workaround for F5 middle boxes. |
56 | * Bug fixes | 56 | * Bug fixes |
57 | - Improved standards compliance for supported groups and key shares | ||
58 | extensions | ||
59 | - Duplicate key shares are disallowed | ||
60 | - Duplicate supported groups are disallowed | ||
61 | - Key shares must be sent in the order of supported groups. | ||
62 | - Key shares will only be selected if they match the most | ||
63 | preferred supported group by client preference order. | ||
57 | - Fixed signed integer overflow in bnrand(). | 64 | - Fixed signed integer overflow in bnrand(). |
58 | 65 | ||
59 | 3.9.0 - Development release | 66 | 3.9.0 - Development release |
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index c0c05f2..835bb2b 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -177,7 +177,7 @@ if(HOST_ASM_MINGW64_X86_64) | |||
177 | sha/sha512-mingw64-x86_64.S | 177 | sha/sha512-mingw64-x86_64.S |
178 | cpuid-mingw64-x86_64.S | 178 | cpuid-mingw64-x86_64.S |
179 | ) | 179 | ) |
180 | add_definitions(-Dendbr64=) | 180 | add_definitions(-Dendbr32=endbr64) |
181 | add_definitions(-DAES_ASM) | 181 | add_definitions(-DAES_ASM) |
182 | add_definitions(-DBSAES_ASM) | 182 | add_definitions(-DBSAES_ASM) |
183 | add_definitions(-DVPAES_ASM) | 183 | add_definitions(-DVPAES_ASM) |
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index 3c279c4..7d0d3f7 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 | |||
@@ -17,6 +17,7 @@ ASM_X86_64_MINGW64 += cpuid-mingw64-x86_64.S | |||
17 | EXTRA_DIST += $(ASM_X86_64_MINGW64) | 17 | EXTRA_DIST += $(ASM_X86_64_MINGW64) |
18 | 18 | ||
19 | if HOST_ASM_MINGW64_X86_64 | 19 | if HOST_ASM_MINGW64_X86_64 |
20 | libcrypto_la_CPPFLAGS += -Dendbr32=endbr64 | ||
20 | libcrypto_la_CPPFLAGS += -DAES_ASM | 21 | libcrypto_la_CPPFLAGS += -DAES_ASM |
21 | libcrypto_la_CPPFLAGS += -DBSAES_ASM | 22 | libcrypto_la_CPPFLAGS += -DBSAES_ASM |
22 | libcrypto_la_CPPFLAGS += -DVPAES_ASM | 23 | libcrypto_la_CPPFLAGS += -DVPAES_ASM |
@@ -184,7 +184,7 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui | |||
184 | $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym | 184 | $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym |
185 | 185 | ||
186 | fixup_masm() { | 186 | fixup_masm() { |
187 | cpp -I./crypto -I./include/compat -D_MSC_VER $1 \ | 187 | cpp -I./crypto -I./include/compat -D_MSC_VER -U__CET__ $1 \ |
188 | | sed -e 's/^#/;/' \ | 188 | | sed -e 's/^#/;/' \ |
189 | | sed -e 's/|/OR/g' \ | 189 | | sed -e 's/|/OR/g' \ |
190 | | sed -e 's/~/NOT/g' \ | 190 | | sed -e 's/~/NOT/g' \ |