diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | appveyor.yml | 29 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | crypto/compat/posix_win.c | 6 | ||||
| -rw-r--r-- | include/compat/unistd.h | 9 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
8 files changed, 73 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e198f7c..515b3fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | if(MSVC) | ||
| 2 | cmake_minimum_required (VERSION 3.16.4) | ||
| 3 | cmake_policy(SET CMP0091 NEW) | ||
| 4 | else() | ||
| 1 | cmake_minimum_required (VERSION 3.0) | 5 | cmake_minimum_required (VERSION 3.0) |
| 6 | endif() | ||
| 2 | include(CheckFunctionExists) | 7 | include(CheckFunctionExists) |
| 3 | include(CheckSymbolExists) | 8 | include(CheckSymbolExists) |
| 4 | include(CheckLibraryExists) | 9 | include(CheckLibraryExists) |
| @@ -36,6 +41,11 @@ option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some plat | |||
| 36 | option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF) | 41 | option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF) |
| 37 | set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE) | 42 | set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE) |
| 38 | 43 | ||
| 44 | option(USE_STATIC_MSVC_RUNTIMES "Use /MT instead of /MD in MSVC" OFF) | ||
| 45 | if(USE_STATIC_MSVC_RUNTIMES) | ||
| 46 | set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") | ||
| 47 | endif() | ||
| 48 | |||
| 39 | if(NOT LIBRESSL_SKIP_INSTALL) | 49 | if(NOT LIBRESSL_SKIP_INSTALL) |
| 40 | set( ENABLE_LIBRESSL_INSTALL ON ) | 50 | set( ENABLE_LIBRESSL_INSTALL ON ) |
| 41 | endif(NOT LIBRESSL_SKIP_INSTALL) | 51 | endif(NOT LIBRESSL_SKIP_INSTALL) |
| @@ -28,6 +28,33 @@ history is also available from Git. | |||
| 28 | 28 | ||
| 29 | LibreSSL Portable Release Notes: | 29 | LibreSSL Portable Release Notes: |
| 30 | 30 | ||
| 31 | 3.1.1 - Stable release | ||
| 32 | |||
| 33 | * Improved SSL_CTX_set_cipher_list(3) and SSL_set_cipher_list(3) to | ||
| 34 | include TLSv1.3 cipher suites even if cipher string does not | ||
| 35 | indicate it. | ||
| 36 | |||
| 37 | * Improved to handle TLSv1.3 HelloRetryRequest. | ||
| 38 | |||
| 39 | * Provided TLSv1.3 cipher suite aliases to match the names used | ||
| 40 | in RFC 8446. | ||
| 41 | |||
| 42 | * Improved to allow using any of the groups in our NID list to | ||
| 43 | generate a client key share. | ||
| 44 | |||
| 45 | * Fixed printing the serialNumber with X509_print_ex() fall back to | ||
| 46 | the colon separated hex bytes in case greater than int value. | ||
| 47 | |||
| 48 | * Fixed to disallow setting the AES-GCM IV length to zero. | ||
| 49 | |||
| 50 | * Added -groups option to openssl(1) s_server subcommand. | ||
| 51 | |||
| 52 | * Fixed to show TLSv1.3 extension type with openssl(1) -tlsextdebug. | ||
| 53 | |||
| 54 | * Improved portable builds to support for use of static MSVC runtimes. | ||
| 55 | |||
| 56 | * Fixed portable builds to avoid exporting a sleep() symbol. | ||
| 57 | |||
| 31 | 3.1.0 - Development release | 58 | 3.1.0 - Development release |
| 32 | 59 | ||
| 33 | * Completed initial TLS 1.3 implementation with a completely new state | 60 | * Completed initial TLS 1.3 implementation with a completely new state |
diff --git a/appveyor.yml b/appveyor.yml index 8ac2045..4e0b488 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -1,25 +1,28 @@ | |||
| 1 | image: | 1 | image: |
| 2 | - Visual Studio 2015 | 2 | - Visual Studio 2019 |
| 3 | #- Visual Studio 2017 | ||
| 4 | 3 | ||
| 5 | environment: | 4 | environment: |
| 6 | PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH% | 5 | PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH% |
| 7 | 6 | ||
| 8 | matrix: | 7 | matrix: |
| 9 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | 8 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
| 10 | GENERATOR: Visual Studio 14 2015 Win64 | 9 | GENERATOR: Visual Studio 16 2019 |
| 10 | ARCHITECTURE: Win32 | ||
| 11 | CONFIG: Release | 11 | CONFIG: Release |
| 12 | SHARED_LIBS: ON | 12 | SHARED_LIBS: ON |
| 13 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | 13 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
| 14 | GENERATOR: Visual Studio 14 2015 | 14 | GENERATOR: Visual Studio 16 2019 |
| 15 | CONFIG: Release | 15 | ARCHITECTURE: Win32 |
| 16 | SHARED_LIBS: ON | ||
| 17 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | ||
| 18 | GENERATOR: Visual Studio 14 2015 Win64 | ||
| 19 | CONFIG: Release | 16 | CONFIG: Release |
| 20 | SHARED_LIBS: OFF | 17 | SHARED_LIBS: OFF |
| 21 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 | 18 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
| 22 | GENERATOR: Visual Studio 14 2015 | 19 | GENERATOR: Visual Studio 16 2019 |
| 20 | ARCHITECTURE: x64 | ||
| 21 | CONFIG: Release | ||
| 22 | SHARED_LIBS: ON | ||
| 23 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||
| 24 | GENERATOR: Visual Studio 16 2019 | ||
| 25 | ARCHITECTURE: x64 | ||
| 23 | CONFIG: Release | 26 | CONFIG: Release |
| 24 | SHARED_LIBS: OFF | 27 | SHARED_LIBS: OFF |
| 25 | 28 | ||
| @@ -34,7 +37,7 @@ before_build: | |||
| 34 | - bash autogen.sh | 37 | - bash autogen.sh |
| 35 | - mkdir build | 38 | - mkdir build |
| 36 | - cd build | 39 | - cd build |
| 37 | - cmake .. -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%SHARED_LIBS% -DCMAKE_INSTALL_PREFIX=../local | 40 | - cmake .. -G "%GENERATOR%" -A "%ARCHITECTURE%" -DBUILD_SHARED_LIBS=%SHARED_LIBS% -DCMAKE_INSTALL_PREFIX=../local |
| 38 | 41 | ||
| 39 | build_script: | 42 | build_script: |
| 40 | - cmake --build . --config %CONFIG% | 43 | - cmake --build . --config %CONFIG% |
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index e6cfc65..01effbf 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -808,7 +808,6 @@ if(WIN32) | |||
| 808 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_write) | 808 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_write) |
| 809 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_getsockopt) | 809 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_getsockopt) |
| 810 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_setsockopt) | 810 | set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_setsockopt) |
| 811 | set(EXTRA_EXPORT ${EXTRA_EXPORT} sleep) | ||
| 812 | endif() | 811 | endif() |
| 813 | 812 | ||
| 814 | if(NOT HAVE_ASPRINTF) | 813 | if(NOT HAVE_ASPRINTF) |
diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c index 4b4b5f5..30c93cd 100644 --- a/crypto/compat/posix_win.c +++ b/crypto/compat/posix_win.c | |||
| @@ -242,10 +242,4 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp) | |||
| 242 | return 0; | 242 | return 0; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | unsigned int sleep(unsigned int seconds) | ||
| 246 | { | ||
| 247 | Sleep(seconds * 1000); | ||
| 248 | return seconds; | ||
| 249 | } | ||
| 250 | |||
| 251 | #endif | 245 | #endif |
diff --git a/include/compat/unistd.h b/include/compat/unistd.h index f521b94..5e6ab1d 100644 --- a/include/compat/unistd.h +++ b/include/compat/unistd.h | |||
| @@ -37,7 +37,14 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset); | |||
| 37 | 37 | ||
| 38 | #define access _access | 38 | #define access _access |
| 39 | 39 | ||
| 40 | unsigned int sleep(unsigned int seconds); | 40 | #ifdef _MSC_VER |
| 41 | #include <windows.h> | ||
| 42 | static inline unsigned int sleep(unsigned int seconds) | ||
| 43 | { | ||
| 44 | Sleep(seconds * 1000); | ||
| 45 | return seconds; | ||
| 46 | } | ||
| 47 | #endif | ||
| 41 | 48 | ||
| 42 | int ftruncate(int fd, off_t length); | 49 | int ftruncate(int fd, off_t length); |
| 43 | uid_t getuid(void); | 50 | uid_t getuid(void); |
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7f44862..80b785d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
| @@ -352,6 +352,13 @@ if(NOT BUILD_SHARED_LIBS) | |||
| 352 | add_test(recordtest recordtest) | 352 | add_test(recordtest recordtest) |
| 353 | endif() | 353 | endif() |
| 354 | 354 | ||
| 355 | # record_layer_test | ||
| 356 | if(NOT BUILD_SHARED_LIBS) | ||
| 357 | add_executable(record_layer_test record_layer_test.c) | ||
| 358 | target_link_libraries(record_layer_test ${OPENSSL_LIBS}) | ||
| 359 | add_test(record_layer_test record_layer_test) | ||
| 360 | endif() | ||
| 361 | |||
| 355 | # rfc5280time | 362 | # rfc5280time |
| 356 | add_executable(rfc5280time rfc5280time.c) | 363 | add_executable(rfc5280time rfc5280time.c) |
| 357 | target_link_libraries(rfc5280time ${OPENSSL_LIBS}) | 364 | target_link_libraries(rfc5280time ${OPENSSL_LIBS}) |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e7a597..7463f26 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
| @@ -342,6 +342,11 @@ TESTS += recordtest | |||
| 342 | check_PROGRAMS += recordtest | 342 | check_PROGRAMS += recordtest |
| 343 | recordtest_SOURCES = recordtest.c | 343 | recordtest_SOURCES = recordtest.c |
| 344 | 344 | ||
| 345 | # record_layer_test | ||
| 346 | TESTS += record_layer_test | ||
| 347 | check_PROGRAMS += record_layer_test | ||
| 348 | record_layer_test_SOURCES = record_layer_test.c | ||
| 349 | |||
| 345 | # rfc5280time | 350 | # rfc5280time |
| 346 | check_PROGRAMS += rfc5280time | 351 | check_PROGRAMS += rfc5280time |
| 347 | rfc5280time_SOURCES = rfc5280time.c | 352 | rfc5280time_SOURCES = rfc5280time.c |