From b213aa282a57879fb49fb46eb72409912d4d731d Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 12 Jul 2024 13:58:47 -0700
Subject: [PATCH 1/2] feat(NODE-6265): add Spectre mitigation and CFG

---
 binding.gyp  | 9 +++++++++
 package.json | 1 +
 2 files changed, 10 insertions(+)

diff --git a/binding.gyp b/binding.gyp
index 0407d77f..1eb34762 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -21,15 +21,24 @@
       },
       'cflags!': [ '-fno-exceptions' ],
       'cflags_cc!': [ '-fno-exceptions' ],
+      'msvs_configuration_attributes': {
+        'SpectreMitigation': 'Spectre'
+      },
       'msvs_settings': {
         'VCCLCompilerTool': {
           'ExceptionHandling': 1,
           'AdditionalOptions': [
+            '/guard:cf',
             '/w34244',
             '/w34267',
             '/ZH:SHA_256'
           ]
         },
+        'VCLinkerTool': {
+          'AdditionalOptions': [
+            '/guard:cf'
+          ]
+        }
       },
       'conditions': [
         ['OS=="mac"', { 'cflags+': ['-fvisibility=hidden'] }],
diff --git a/package.json b/package.json
index 414ac9f7..c2d95cfb 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
   },
   "scripts": {
     "install": "prebuild-install --runtime napi || node-gyp rebuild",
+    "rebuild": "node-gyp rebuild",
     "format-cxx": "clang-format -i 'src/**/*'",
     "format-js": "eslint lib test --fix",
     "check:lint": "eslint lib test",

From 9e4e71cccc6a392ef5e855e6def5a41f16cc18ad Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:04:42 -0700
Subject: [PATCH 2/2] Undo extra addition

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index c2d95cfb..414ac9f7 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,6 @@
   },
   "scripts": {
     "install": "prebuild-install --runtime napi || node-gyp rebuild",
-    "rebuild": "node-gyp rebuild",
     "format-cxx": "clang-format -i 'src/**/*'",
     "format-js": "eslint lib test --fix",
     "check:lint": "eslint lib test",