tls: use process.binding('config') to detect fips mode · nodejs/node@06327e5 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 637
• Pull requests 760
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 06327e5

Browse filesBrowse the repository at this point in the historyBrowse files

jasnell

authored and

Myles Borins

committed

tls: use process.binding('config') to detect fips mode

When the fips mode check was added sometime in v4 it caused a regression in some edge cases (see #6114) because `process.config` can be overwritten by userland modules. This switches to using the backported process.binding('config') to fix the regression. Fixes: #6114 PR-URL: #7551 Reviewed-By: Myles Borins <myles.borins@gmail.com>

1 parent b9136c0 commit 06327e5
Copy full SHA for 06327e5

2 files changed

+5-2Lines changed: 5 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • _tls_wrap.js
• src
  • node_config.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/_tls_wrap.js‎

Copy file name to clipboardExpand all lines: lib/_tls_wrap.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -19,7 +19,7 @@ const defaultSessionIdContext = getDefaultSessionIdContext();
19	19	function getDefaultSessionIdContext() {
20	20	var defaultText = process.argv.join(' ');
21	21	/* SSL_MAX_SID_CTX_LENGTH is 128 bits */
22		- if (process.config.variables.openssl_fips) {
	22	+ if (process.binding('config').fipsMode) {
23	23	return crypto.createHash('sha1')
24	24	.update(defaultText)
25	25	.digest('hex').slice(0, 32);

Collapse file

‎src/node_config.cc‎

Copy file name to clipboardExpand all lines: src/node_config.cc

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -28,7 +28,10 @@ using v8::ReadOnly;
28	28	void InitConfig(Local<Object> target,
29	29	Local<Value> unused,
30	30	Local<Context> context) {
31		- // Environment* env = Environment::GetCurrent(context);
	31	+ #ifdef NODE_FIPS_MODE
	32	+ Environment* env = Environment::GetCurrent(context);
	33	+ READONLY_BOOLEAN_PROPERTY("fipsMode");
	34	+ #endif
32	35	}
33	36
34	37	} // namespace node

0 commit comments

Comments

0 (0)