Open a BCrypt algorithm handle by ChrisDenton · Pull Request #101476 · rust-lang/rust

ChrisDenton · 2022-09-06T09:56:11Z

Replaces use of a pseduo handle with manually opening a algorithm handle.

Most interesting thing here is the atomics.

rustbot · 2022-09-06T09:56:14Z

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

library/std/src/sys/windows/rand.rs

thomcc · 2022-09-07T09:49:41Z

Thanks, looks great!

@bors r+

bors · 2022-09-07T09:49:43Z

📌 Commit b2e4f9d has been approved by thomcc

It is now in the queue for this repository.

ChrisDenton · 2022-09-07T09:51:52Z

@bors p=1 so the fix is sure to be in the next nightly

…omcc Open a BCrypt algorithm handle Fixes rust-lang#101474, supplants rust-lang#101456. Replaces use of a pseduo handle with manually opening a algorithm handle. Most interesting thing here is the atomics. r? `@thomcc`

ChrisDenton · 2022-09-07T12:44:43Z

@bors r-
@bors r=thomcc

bors · 2022-09-07T12:44:46Z

📌 Commit a68ba39e7733dbb427708ef164164c2c55705a3c has been approved by thomcc

It is now in the queue for this repository.

ChrisDenton · 2022-09-07T12:47:36Z

@thomcc I pushed small commit so that miri won't be broken by this. The weirdness is a little hack to avoid having to use a bunch of #[cfg(not(miri))]. Feel free r- if this is not ok. Should have a few hours before it's next in the queue.

bors · 2022-09-07T12:52:20Z

⌛ Testing commit a68ba39e7733dbb427708ef164164c2c55705a3c with merge d27cb8dad98c06b510106bd299076341741ca0e1...

bors · 2022-09-07T12:56:41Z

💔 Test failed - checks-actions

ChrisDenton · 2022-09-07T13:08:25Z

fixed formatting

@bors r=thomcc

bors · 2022-09-07T13:08:28Z

📌 Commit 832c7af has been approved by thomcc

It is now in the queue for this repository.

bors · 2022-09-07T13:08:29Z

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

bors · 2022-09-07T18:54:07Z

⌛ Testing commit 832c7af with merge 9682b5d...

bors · 2022-09-07T21:17:23Z

☀️ Test successful - checks-actions
Approved by: thomcc
Pushing 9682b5d to master...

rust-timer · 2022-09-07T23:53:03Z

Finished benchmarking commit (9682b5d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	2.5%	[2.5%, 2.5%]	1
Regressions ❌ (secondary)	0.4%	[0.4%, 0.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.5%	[2.5%, 2.5%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.6%	[-3.0%, -2.2%]	2
Improvements ✅ (secondary)	-4.3%	[-5.2%, -3.5%]	2
All ❌✅ (primary)	-2.6%	[-3.0%, -2.2%]	2

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

RalfJung · 2022-09-08T06:13:32Z

library/std/src/sys/windows/rand.rs

+    #[cfg(miri)]
+    fn open() -> Result<Self, c::NTSTATUS> {
+        const BCRYPT_RNG_ALG_HANDLE: c::BCRYPT_ALG_HANDLE = ptr::invalid_mut(0x81);
+        let _ = (
+            c::BCryptOpenAlgorithmProvider,
+            c::BCryptCloseAlgorithmProvider,
+            c::BCRYPT_RNG_ALGORITHM,
+            c::STATUS_NOT_SUPPORTED,
+        );
+        Ok(Self(BCRYPT_RNG_ALG_HANDLE))
+    }


I am surprised to see a Miri special path here; usually we try to execute the real thing where feasible (and BCryptOpenAlgorithmProvider looks easy enough to fake). Also please Cc @rust-lang/miri when adding such a codepath, and always add a comment explaining why Miri uses a different codepath.

Yeah, for this I'd say it's better to just add the shims to miri.

Sorry! My intent was for this to be temporary until I was confident that the crash issue was addressed. Then we can go back to using BCRYPT_USE_SYSTEM_PREFERRED_RNG as the default and BCryptOpenAlgorithmProvider would be the fallback. I can submit a PR to undo tho.

Ah, if this is just temporary then implementing the shims in Miri would indeed not be worth it.

rust-highfive assigned thomcc Sep 6, 2022

rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 6, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2022

thomcc reviewed Sep 6, 2022

View reviewed changes

library/std/src/sys/windows/rand.rs Outdated Show resolved Hide resolved

library/std/src/sys/windows/rand.rs Outdated Show resolved Hide resolved

BlackHoleFox reviewed Sep 6, 2022

View reviewed changes

library/std/src/sys/windows/rand.rs Outdated Show resolved Hide resolved

Open a BCrypt algorithm handle

b2e4f9d

ChrisDenton force-pushed the BCryptRandom-fix branch from 65b32b1 to b2e4f9d Compare September 6, 2022 18:30

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 7, 2022

Dylan-DPC mentioned this pull request Sep 7, 2022

Rollup of 8 pull requests #101526

Closed

RalfJung mentioned this pull request Sep 7, 2022

Update miri submodule #101522

Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 7, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 7, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 7, 2022

Don't break windows/rand for miri

832c7af

ChrisDenton force-pushed the BCryptRandom-fix branch from a68ba39 to 832c7af Compare September 7, 2022 13:00

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 7, 2022

This comment has been minimized.

Sign in to view

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 7, 2022

bors merged commit 9682b5d into rust-lang:master Sep 7, 2022

rustbot added this to the 1.65.0 milestone Sep 7, 2022

RalfJung reviewed Sep 8, 2022

View reviewed changes

josephlr mentioned this pull request Oct 26, 2022

Windows: should we fall back to RtlGenRandom if BCryptGenRandom fails rust-random/getrandom#314

Closed

Uh oh!

Conversation

ChrisDenton commented Sep 6, 2022

Uh oh!

rustbot commented Sep 6, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thomcc commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

ChrisDenton commented Sep 7, 2022

Uh oh!

ChrisDenton commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

ChrisDenton commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

ChrisDenton commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

This comment has been minimized.

bors commented Sep 7, 2022

Uh oh!

bors commented Sep 7, 2022

Uh oh!

rust-timer commented Sep 7, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

RalfJung Sep 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thomcc Sep 8, 2022

Choose a reason for hiding this comment

Uh oh!

ChrisDenton Sep 8, 2022

Choose a reason for hiding this comment

Uh oh!

RalfJung Sep 8, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

RalfJung Sep 8, 2022 •

edited

Loading