[2.4] Cherry Pick Load Flags Commit (#4884)

* Fix Windows Loader Flags (#4883)

* Update Patch Version

* Allow non-System32 DLL Loads for Sanitizer Builds (#4886)

* cp key update crash

Author: nibanks

.azure/OneBranch.Package.yml

@@ -95,7 +95,7 @@ extends:
           ob_createvpack_owneralias: quicdev
           ob_createvpack_description: msquic.$(Build.SourceBranchName)
           ob_createvpack_versionAs: string
-          ob_createvpack_version: 2.4.7-$(Build.BuildId)
+          ob_createvpack_version: 2.4.8-$(Build.BuildId)
         steps:
         - task: DownloadPipelineArtifact@2
           inputs:

CMakeLists.txt

@@ -19,7 +19,7 @@ message(STATUS "CMAKE Version: ${CMAKE_VERSION}")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_VS_GLOBALS "UseInternalMSUniCrtPackage=true")
- 
+
 message(STATUS "Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "Host System name: ${CMAKE_HOST_SYSTEM_NAME}")
 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
@@ -57,7 +57,7 @@ message(STATUS "Platform version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
 set(QUIC_MAJOR_VERSION 2)
-set(QUIC_FULL_VERSION 2.4.7)
+set(QUIC_FULL_VERSION 2.4.8)
 
 if (WIN32)
     set(CX_PLATFORM "windows")
@@ -229,6 +229,14 @@ if (WIN32)
         endif()
     endif()
 
+    if (QUIC_ENABLE_SANITIZERS)
+        message(STATUS "Allowing non-system32 DLLs to be loaded for ASAN")
+    else()
+        # Configure linker to only load from the system directory.
+        message(STATUS "Configuring linker to only load from the system directory")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEPENDENTLOADFLAG:0x800")
+    endif()
+
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
         list(APPEND QUIC_COMMON_FLAGS /MP)
     endif()

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "msquic"
-version = "2.4.7-beta"
+version = "2.4.8-beta"
 edition = "2018"
 authors = ["Microsoft"]
 description = "Microsoft implementation of the IETF QUIC protocol"

scripts/package-distribution.ps1

@@ -24,7 +24,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin"
 # All direct subfolders are OS's
 $Platforms = Get-ChildItem -Path $ArtifactsBinDir
 
-$Version = "2.4.7"
+$Version = "2.4.8"
 
 $WindowsBuilds = @()
 $AllBuilds = @()

scripts/package-nuget.ps1

@@ -153,7 +153,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist"
 $CurrentCommitHash = Get-GitHash -RepoDir $RootDir
 $RepoRemote = Get-GitRemote -RepoDir $RootDir
 
-$Version = "2.4.7"
+$Version = "2.4.8"
 
 $BuildId = $env:BUILD_BUILDID
 if ($null -ne $BuildId) {

scripts/write-versions.ps1

@@ -26,7 +26,7 @@ $ArtifactsDir = $BuildConfig.ArtifactsDir
 $SourceVersion = $env:BUILD_SOURCEVERSION;
 $SourceBranch = $env:BUILD_SOURCEBRANCH;
 $BuildId = $env:BUILD_BUILDID;
-$VersionNumber = "2.4.7";
+$VersionNumber = "2.4.8";
 
 class BuildData {
     [string]$SourceVersion;

src/bin/CMakeLists.txt

@@ -15,9 +15,6 @@ if(BUILD_SHARED_LIBS)
     set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME})
     if (NOT WIN32)
         set_target_properties(msquic PROPERTIES SOVERSION ${QUIC_MAJOR_VERSION} VERSION ${QUIC_FULL_VERSION})
-    else()
-        # Configure linker to only load from the system directory.
-        set_target_properties(msquic PROPERTIES LINK_FLAGS "/DEPENDENTLOADFLAG:0x800")
     endif()
 else()
     add_library(msquic_static STATIC static/empty.c)

src/distribution/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleVersion</key>
-    <string>2.4.7</string>
+    <string>2.4.8</string>
     <key>NSHumanReadableCopyright</key>
     <string>MIT</string>
     <key>CFBundleGetInfoString</key>

src/inc/msquic.ver

@@ -12,7 +12,7 @@
 #endif
 
 #ifndef VER_PATCH
-#define VER_PATCH 7
+#define VER_PATCH 8
 #endif
 
 #ifndef VER_BUILD_ID

src/platform/crypt.c

@@ -489,7 +489,7 @@ QuicPacketKeyUpdate(
     _Out_ QUIC_PACKET_KEY** NewKey
     )
 {
-    if (OldKey->Type != QUIC_PACKET_KEY_1_RTT) {
+    if (OldKey == NULL || OldKey->Type != QUIC_PACKET_KEY_1_RTT) {
         return QUIC_STATUS_INVALID_STATE;
     }