-
Notifications
You must be signed in to change notification settings - Fork 234
Add Windows UWP support #69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e050963
add UWP support
newpavlov f871486
add appveyor CI for UWP targets
newpavlov 6f147a1
fix CI cfg
newpavlov 8ff7697
temporary disable CI for UWP
newpavlov 0d51ab5
remove uwp feature, use a stricter condition in build.rs
newpavlov 6b113ff
clean Cargo.toml
newpavlov cdb2033
remove std::u32 import
newpavlov bd5af6d
Add UWP target build to Travis CI
newpavlov 1af5963
fix match
newpavlov b403d6e
modify appveyor config
newpavlov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#![deny(warnings)] | ||
|
||
use std::env; | ||
|
||
fn main() { | ||
let target = env::var("TARGET").expect("TARGET was not set"); | ||
if target.contains("-uwp-windows-") { | ||
// for BCryptGenRandom | ||
println!("cargo:rustc-link-lib=bcrypt"); | ||
// to work around unavailability of `target_vendor` on Rust 1.33 | ||
println!("cargo:rustc-cfg=getrandom_uwp"); | ||
} else if target.contains("windows") { | ||
// for RtlGenRandom (aka SystemFunction036) | ||
println!("cargo:rustc-link-lib=advapi32"); | ||
} else if target.contains("apple-ios") { | ||
// for SecRandomCopyBytes and kSecRandomDefault | ||
println!("cargo:rustc-link-lib=framework=Security"); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
// Copyright 2018 Developers of the Rand project. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
//! Implementation for Windows UWP targets. After deprecation of Windows XP | ||
//! and Vista, this can superseed the `RtlGenRandom`-based implementation. | ||
use crate::Error; | ||
use core::{ffi::c_void, num::NonZeroU32, ptr}; | ||
|
||
const BCRYPT_USE_SYSTEM_PREFERRED_RNG: u32 = 0x00000002; | ||
|
||
extern "system" { | ||
fn BCryptGenRandom( | ||
hAlgorithm: *mut c_void, | ||
pBuffer: *mut u8, | ||
cbBuffer: u32, | ||
dwFlags: u32, | ||
) -> u32; | ||
} | ||
|
||
pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> { | ||
// Prevent overflow of u32 | ||
for chunk in dest.chunks_mut(u32::max_value() as usize) { | ||
let ret = unsafe { | ||
BCryptGenRandom( | ||
ptr::null_mut(), | ||
chunk.as_mut_ptr(), | ||
chunk.len() as u32, | ||
BCRYPT_USE_SYSTEM_PREFERRED_RNG, | ||
) | ||
}; | ||
// NTSTATUS codes use two highest bits for severity status | ||
match ret >> 30 { | ||
0b01 => { | ||
info!("BCryptGenRandom: information code 0x{:08X}", ret); | ||
} | ||
0b10 => { | ||
warn!("BCryptGenRandom: warning code 0x{:08X}", ret); | ||
} | ||
0b11 => { | ||
error!("BCryptGenRandom: failed with 0x{:08X}", ret); | ||
// We zeroize the highest bit, so the error code will reside | ||
// inside the range of designated for OS codes. | ||
let code = ret ^ (1 << 31); | ||
// SAFETY: the second highest bit is always equal to one, | ||
// so it's impossible to get zero. Unfortunately compiler | ||
// is not smart enough to figure out it yet. | ||
let code = unsafe { NonZeroU32::new_unchecked(code) }; | ||
return Err(Error::from(code)); | ||
} | ||
_ => (), | ||
} | ||
} | ||
Ok(()) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.