From ea56e4702f9d3af8d7dd89e27554dfa54524025f Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Wed, 1 May 2019 11:45:45 -0700
Subject: [PATCH] tls: add --tls-min-v1.2 CLI switch

Switch added in v11.x, add it to master/12.x for consistency and
compatibility.

See: https://github.com/nodejs/node/pull/26951, commit bf2c283555c6b26
---
 doc/api/cli.md                                |  9 +++++++++
 doc/node.1                                    |  4 ++++
 lib/tls.js                                    |  2 ++
 src/node_options.cc                           |  4 ++++
 src/node_options.h                            |  1 +
 test/parallel/test-tls-cli-min-version-1.2.js | 15 +++++++++++++++
 6 files changed, 35 insertions(+)
 create mode 100644 test/parallel/test-tls-cli-min-version-1.2.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 50185b0cc094c3..e819451ee132b4 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -586,6 +586,15 @@ added: v12.0.0
 Set default [`tls.DEFAULT_MIN_VERSION`][] to 'TLSv1.1'. Use for compatibility
 with old TLS clients or servers.
 
+### `--tls-min-v1.2`
+<!-- YAML
+added: REPLACEME
+-->
+
+Set default [`tls.DEFAULT_MIN_VERSION`][] to 'TLSv1.2'. This is the default for
+12.x and later, but the option is supported for compatibility with older Node.js
+versions.
+
 ### `--tls-min-v1.3`
 <!-- YAML
 added: v12.0.0
diff --git a/doc/node.1 b/doc/node.1
index 5c0e23d7014606..0b094c62e89e29 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -278,6 +278,10 @@ or servers.
 Set default minVersion to 'TLSv1.1'. Use for compatibility with old TLS clients
 or servers.
 .
+.It Fl -tls-min-v1.2
+Set default minVersion to 'TLSv1.2'. This is the default for 12.x and later,
+but the option is supported for compatibility with older Node.js versions.
+.
 .It Fl -tls-min-v1.3
 Set default minVersion to 'TLSv1.3'. Use to disable support for TLSv1.2 in
 favour of TLSv1.3, which is more secure.
diff --git a/lib/tls.js b/lib/tls.js
index 422ed7958a1ee7..fa247411f39aa5 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -60,6 +60,8 @@ if (getOptionValue('--tls-min-v1.0'))
   exports.DEFAULT_MIN_VERSION = 'TLSv1';
 else if (getOptionValue('--tls-min-v1.1'))
   exports.DEFAULT_MIN_VERSION = 'TLSv1.1';
+else if (getOptionValue('--tls-min-v1.2'))
+  exports.DEFAULT_MIN_VERSION = 'TLSv1.2';
 else if (getOptionValue('--tls-min-v1.3'))
   exports.DEFAULT_MIN_VERSION = 'TLSv1.3';
 else
diff --git a/src/node_options.cc b/src/node_options.cc
index 552997e58cf5a2..e56253e71a2bdb 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -428,6 +428,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "set default TLS minimum to TLSv1.1 (default: TLSv1.2)",
             &EnvironmentOptions::tls_min_v1_1,
             kAllowedInEnvironment);
+  AddOption("--tls-min-v1.2",
+            "set default TLS minimum to TLSv1.2 (default: TLSv1.2)",
+            &EnvironmentOptions::tls_min_v1_2,
+            kAllowedInEnvironment);
   AddOption("--tls-min-v1.3",
             "set default TLS minimum to TLSv1.3 (default: TLSv1.2)",
             &EnvironmentOptions::tls_min_v1_3,
diff --git a/src/node_options.h b/src/node_options.h
index 2aca1f327c889e..b640b14d93639a 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -134,6 +134,7 @@ class EnvironmentOptions : public Options {
 
   bool tls_min_v1_0 = false;
   bool tls_min_v1_1 = false;
+  bool tls_min_v1_2 = false;
   bool tls_min_v1_3 = false;
   bool tls_max_v1_2 = false;
   bool tls_max_v1_3 = false;
diff --git a/test/parallel/test-tls-cli-min-version-1.2.js b/test/parallel/test-tls-cli-min-version-1.2.js
new file mode 100644
index 00000000000000..8385eabd0baba0
--- /dev/null
+++ b/test/parallel/test-tls-cli-min-version-1.2.js
@@ -0,0 +1,15 @@
+// Flags: --tls-min-v1.2
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto) common.skip('missing crypto');
+
+// Check that node `--tls-min-v1.2` is supported.
+
+const assert = require('assert');
+const tls = require('tls');
+
+assert.strictEqual(tls.DEFAULT_MAX_VERSION, 'TLSv1.3');
+assert.strictEqual(tls.DEFAULT_MIN_VERSION, 'TLSv1.2');
+
+// Check the min-max version protocol versions against these CLI settings.
+require('./test-tls-min-max-version.js');