Merge branch 'main' into penpal-openssl-cleanse-sweep

Author: justsmth

crypto/CMakeLists.txt

@@ -916,12 +916,14 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.12")
           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
           LIBRARY
             DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            NAMELINK_COMPONENT Development)
+            NAMELINK_COMPONENT Development
+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 else()
   install(TARGETS crypto
           EXPORT crypto-targets
           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(MSVC AND CMAKE_BUILD_TYPE_LOWER MATCHES "relwithdebinfo" AND FIPS)

ssl/CMakeLists.txt

@@ -118,12 +118,14 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.12")
           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
           LIBRARY
             DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            NAMELINK_COMPONENT Development)
+            NAMELINK_COMPONENT Development
+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 else()
   install(TARGETS ssl
           EXPORT ssl-targets
           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(MSVC AND CMAKE_BUILD_TYPE_LOWER MATCHES "relwithdebinfo" AND FIPS)

tests/ci/run_windows_tests.bat

@@ -40,6 +40,9 @@ call :build_and_test Release "-DOPENSSL_NO_ASM=1" || goto error
 @rem tests or copy them around so Windows can find it in the same directory. Instead just put the dll's location onto the path
 set PATH=%BUILD_DIR%;%BUILD_DIR%\crypto;%BUILD_DIR%\ssl;%PATH%
 call :build_and_test Release "-DBUILD_SHARED_LIBS=1" || goto error
+@rem Reuse the build tree from the preceding shared build to verify that
+@rem `cmake --install` places DLLs in bin/ and import libraries in lib/.
+call :verify_install || goto error
 call :build_and_test Release "-DBUILD_SHARED_LIBS=1 -DFIPS=1" || goto error
 if /i not "%ARCH_OPTION%" == "arm64" (
     @rem For FIPS on Windows/x86-64 we also have a RelWithDebInfo build to generate debug symbols.
@@ -110,3 +113,37 @@ exit /b %errorlevel%
 :error
 echo Failed with error #%errorlevel%.
 exit /b 1
+
+@rem Runs `cmake --install` against the already-configured %BUILD_DIR% and
+@rem verifies that the expected shared-library artifacts land in the
+@rem conventional Windows install layout: DLLs in bin/, import libs in lib/.
+@rem Assumes the caller has already done a BUILD_SHARED_LIBS=1 build.
+:verify_install
+@echo on
+set INSTALL_DIR=%TEMP%\awslc_install
+rmdir /s /q "%INSTALL_DIR%" 2>nul
+
+@echo  LOG: %date%-%time% running cmake install into %INSTALL_DIR%
+cmake --install "%BUILD_DIR%" --prefix "%INSTALL_DIR%" || goto error
+
+@echo  LOG: %date%-%time% verifying install layout
+dir "%INSTALL_DIR%\bin\"
+dir "%INSTALL_DIR%\lib\"
+if not exist "%INSTALL_DIR%\bin\crypto.dll" (
+    echo ERROR: crypto.dll not found in %INSTALL_DIR%\bin\
+    goto error
+)
+if not exist "%INSTALL_DIR%\bin\ssl.dll" (
+    echo ERROR: ssl.dll not found in %INSTALL_DIR%\bin\
+    goto error
+)
+if not exist "%INSTALL_DIR%\lib\crypto.lib" (
+    echo ERROR: crypto.lib not found in %INSTALL_DIR%\lib\
+    goto error
+)
+if not exist "%INSTALL_DIR%\lib\ssl.lib" (
+    echo ERROR: ssl.lib not found in %INSTALL_DIR%\lib\
+    goto error
+)
+@echo  LOG: %date%-%time% install verification passed
+exit /b 0