Skip to content

Commit 99af516

Browse files
authored
CP: Randomize Base Address in Kernel Projects (#5063) (#5064)
1 parent e9d854e commit 99af516

13 files changed

+13
-9
lines changed

.azure/OneBranch.Package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ extends:
9595
ob_createvpack_owneralias: quicdev
9696
ob_createvpack_description: msquic.$(Build.SourceBranchName)
9797
ob_createvpack_versionAs: string
98-
ob_createvpack_version: 2.3.11-$(Build.BuildId)
98+
ob_createvpack_version: 2.3.12-$(Build.BuildId)
9999
steps:
100100
- task: DownloadPipelineArtifact@2
101101
inputs:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ message(STATUS "Platform version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
5757
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
5858

5959
set(QUIC_MAJOR_VERSION 2)
60-
set(QUIC_FULL_VERSION 2.3.11)
60+
set(QUIC_FULL_VERSION 2.3.12)
6161

6262
if (WIN32)
6363
set(CX_PLATFORM "windows")

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "msquic"
3-
version = "2.3.11-beta"
3+
version = "2.3.12-beta"
44
edition = "2018"
55
authors = ["Microsoft"]
66
description = "Microsoft implementation of the IETF QUIC protocol"

scripts/package-distribution.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin"
1919
# All direct subfolders are OS's
2020
$Platforms = Get-ChildItem -Path $ArtifactsBinDir
2121

22-
$Version = "2.3.11"
22+
$Version = "2.3.12"
2323

2424
$WindowsBuilds = @()
2525
$AllBuilds = @()

scripts/package-nuget.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist"
153153
$CurrentCommitHash = Get-GitHash -RepoDir $RootDir
154154
$RepoRemote = Get-GitRemote -RepoDir $RootDir
155155

156-
$Version = "2.3.11"
156+
$Version = "2.3.12"
157157

158158
$BuildId = $env:BUILD_BUILDID
159159
if ($null -ne $BuildId) {

scripts/write-versions.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $ArtifactsDir = $BuildConfig.ArtifactsDir
2626
$SourceVersion = $env:BUILD_SOURCEVERSION;
2727
$SourceBranch = $env:BUILD_SOURCEBRANCH;
2828
$BuildId = $env:BUILD_BUILDID;
29-
$VersionNumber = "2.3.11";
29+
$VersionNumber = "2.3.12";
3030

3131
class BuildData {
3232
[string]$SourceVersion;

src/bin/winkernel/msquic.kernel.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<AdditionalDependencies>cng.lib;ksecdd.lib;msnetioid.lib;ndis.lib;netio.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
104104
<AdditionalOptions>/kernel /NOOPTIDATA /pdbcompress /MERGE:.gfids=GFIDS /MERGE:.orpc=.text /MERGE:_PAGE=PAGE /MERGE:_RDATA=.rdata /MERGE:_TEXT=.text /section:GFIDS,d</AdditionalOptions>
105105
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
106+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
106107
</Link>
107108
<ResourceCompile>
108109
<AdditionalIncludeDirectories>..\..\inc;$(SolutionDir)build\winkernel\$(Platform)_$(Configuration)_schannel\inc;$(UM_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/bin/winkernel/msquicpriv.kernel.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<AdditionalDependencies>cng.lib;ksecdd.lib;msnetioid.lib;ndis.lib;netio.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
104104
<AdditionalOptions>/kernel /NOOPTIDATA /pdbcompress /MERGE:.gfids=GFIDS /MERGE:.orpc=.text /MERGE:_PAGE=PAGE /MERGE:_RDATA=.rdata /MERGE:_TEXT=.text /section:GFIDS,d</AdditionalOptions>
105105
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
106+
<RandomizedBaseAddress>true</RandomizedBaseAddress>
106107
</Link>
107108
<ResourceCompile>
108109
<AdditionalIncludeDirectories>..\..\inc;$(SolutionDir)build\winkernel\$(Platform)_$(Configuration)_schannel\inc;$(UM_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/distribution/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleInfoDictionaryVersion</key>
2020
<string>6.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>2.3.11</string>
22+
<string>2.3.12</string>
2323
<key>NSHumanReadableCopyright</key>
2424
<string>MIT</string>
2525
<key>CFBundleGetInfoString</key>

src/inc/msquic.ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#endif
1313

1414
#ifndef VER_PATCH
15-
#define VER_PATCH 11
15+
#define VER_PATCH 12
1616
#endif
1717

1818
#ifndef VER_BUILD_ID

0 commit comments

Comments
 (0)