windows: bump libressl to 4.0.0

Author: martelletto

CMakeLists.txt

@@ -192,6 +192,9 @@ if(MSVC)
 	if(NOT CRYPTO_LIBRARIES)
 		set(CRYPTO_LIBRARIES crypto)
 	endif()
+	if(NOT CRYPTO_DLL)
+		set(CRYPTO_DLL crypto)
+	endif()
 
 	set(MSVC_DISABLED_WARNINGS_LIST
 		"C4152" # nonstandard extension used: function/data pointer
@@ -437,6 +440,9 @@ message(STATUS "CRYPTO_LIBRARY_DIRS: ${CRYPTO_LIBRARY_DIRS}")
 if(BUILD_TESTS)
 	message(STATUS "CRYPTO_BIN_DIRS: ${CRYPTO_BIN_DIRS}")
 endif()
+if(MSVC)
+	message(STATUS "CRYPTO_DLL: ${CRYPTO_DLL}")
+endif()
 message(STATUS "CRYPTO_VERSION: ${CRYPTO_VERSION}")
 message(STATUS "FIDO_VERSION: ${FIDO_VERSION}")
 message(STATUS "FUZZ: ${FUZZ}")

regress/CMakeLists.txt

@@ -18,7 +18,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
 	add_custom_command(TARGET regress POST_BUILD
 	    COMMAND "${CMAKE_COMMAND}" -E copy
 		"${CBOR_BIN_DIRS}/${CBOR_LIBRARIES}.dll"
-		"${CRYPTO_BIN_DIRS}/${CRYPTO_LIBRARIES}.dll"
+		"${CRYPTO_BIN_DIRS}/${CRYPTO_DLL}.dll"
 		"${ZLIB_BIN_DIRS}/${ZLIB_LIBRARIES}.dll"
 		"$<TARGET_FILE:${_FIDO2_LIBRARY}>"
 		"${CMAKE_CURRENT_BINARY_DIR}")

windows/build.ps1

@@ -231,7 +231,8 @@ try {
 	    -DCRYPTO_INCLUDE_DIRS="${PREFIX}\include" `
 	    -DCRYPTO_LIBRARY_DIRS="${PREFIX}\lib" `
 	    -DCRYPTO_BIN_DIRS="${PREFIX}\bin" `
-	    -DCRYPTO_LIBRARIES="${CRYPTO_LIBRARIES}" `
+	    -DCRYPTO_LIBRARIES="${CRYPTO_LIB}" `
+	    -DCRYPTO_DLL="${CRYPTO_DLL}" `
 	    -DCMAKE_C_FLAGS_DEBUG="${CFLAGS_DEBUG} ${Fido2Flags}" `
 	    -DCMAKE_C_FLAGS_RELEASE="${CFLAGS_RELEASE} ${Fido2Flags}" `
 	    -DCMAKE_INSTALL_PREFIX="${PREFIX}"; `
@@ -243,7 +244,7 @@ try {
 	    ExitOnError
 	# Copy DLLs.
 	if ("${SHARED}" -eq "ON") {
-		"cbor.dll", "${CRYPTO_LIBRARIES}.dll", "zlib1.dll" | `
+		"cbor.dll", "${CRYPTO_DLL}.dll", "zlib1.dll" | `
 		    %{ Copy-Item "${PREFIX}\bin\$_" `
 		    -Destination "examples\${Config}" }
 	}

windows/const.ps1

@@ -7,8 +7,9 @@
 New-Variable -Name 'LIBRESSL_URL' `
     -Value 'https://ftp.openbsd.org/pub/OpenBSD/LibreSSL' `
     -Option Constant
-New-Variable -Name 'LIBRESSL' -Value 'libressl-3.9.2' -Option Constant
-New-Variable -Name 'CRYPTO_LIBRARIES' -Value 'crypto' -Option Constant
+New-Variable -Name 'LIBRESSL' -Value 'libressl-4.0.0' -Option Constant
+New-Variable -Name 'CRYPTO_LIB' -Value 'crypto' -Option Constant
+New-Variable -Name 'CRYPTO_DLL' -Value 'crypto-55' -Option Constant
 
 # libcbor coordinates.
 New-Variable -Name 'LIBCBOR' -Value 'libcbor-0.12.0' -Option Constant

windows/release.ps1

@@ -35,22 +35,22 @@ Function Package-Dynamic(${SRC}, ${DEST}) {
 	Copy-Item "${SRC}\lib\cbor.lib" "${DEST}"
 	Copy-Item "${SRC}\bin\zlib1.dll" "${DEST}"
 	Copy-Item "${SRC}\lib\zlib1.lib" "${DEST}"
-	Copy-Item "${SRC}\bin\${CRYPTO_LIBRARIES}.dll" "${DEST}"
-	Copy-Item "${SRC}\lib\${CRYPTO_LIBRARIES}.lib" "${DEST}"
+	Copy-Item "${SRC}\bin\${CRYPTO_DLL}.dll" "${DEST}"
+	Copy-Item "${SRC}\lib\${CRYPTO_LIB}.lib" "${DEST}"
 	Copy-Item "${SRC}\bin\fido2.dll" "${DEST}"
 	Copy-Item "${SRC}\lib\fido2.lib" "${DEST}"
 }
 
 Function Package-Static(${SRC}, ${DEST}) {
 	Copy-Item "${SRC}/lib/cbor.lib" "${DEST}"
 	Copy-Item "${SRC}/lib/zlib1.lib" "${DEST}"
-	Copy-Item "${SRC}/lib/${CRYPTO_LIBRARIES}.lib" "${DEST}"
+	Copy-Item "${SRC}/lib/${CRYPTO_LIB}.lib" "${DEST}"
 	Copy-Item "${SRC}/lib/fido2_static.lib" "${DEST}/fido2.lib"
 }
 
 Function Package-PDBs(${SRC}, ${DEST}) {
 	Copy-Item "${SRC}\${LIBRESSL}\crypto\crypto_obj.dir\${Config}\crypto_obj.pdb" `
-	    "${DEST}\${CRYPTO_LIBRARIES}.pdb"
+	    "${DEST}\${CRYPTO_LIB}.pdb"
 	Copy-Item "${SRC}\${LIBCBOR}\src\cbor.dir\${Config}\vc${SDK}.pdb" `
 	    "${DEST}\cbor.pdb"
 	Copy-Item "${SRC}\${ZLIB}\zlib.dir\${Config}\vc${SDK}.pdb" `