No need

steffengy · Mar 28, 2023 · ccfd221 · ccfd221
1 parent c153c5d
commit ccfd221
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,5 +1,3 @@
-name: Rust
-
 on:
   push:
   # branches:
@@ -8,6 +6,10 @@ on:
   #   - "*"
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
   CARGO_INCREMENTAL: 0
   RUST_TEST_THREADS: 1
@@ -25,6 +27,11 @@ jobs:
             channel: 1.46.0
     steps:
       - uses: actions/checkout@v3
+      # If targeting old cargo without sparse indices, fetch first
+      - uses: dtolnay/rust-toolchain@stable
+        if: matrix.channel != 'nightly'
+      - run: cargo fetch
+        if: matrix.channel != 'nightly'
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.channel }}
@@ -33,6 +40,7 @@ jobs:
         uses: MinoruSekine/setup-scoop@main
       - if: matrix.target == 'i686-pc-windows-gnu'
         run: |
-          scoop install -a 32bit mingw-winlibs
+          scoop install -a 32bit mingw
+          Join-Path (Resolve-Path ~).Path "scoop\apps\mingw\current\bin" >> $env:GITHUB_PATH
       - run: cargo +${{ matrix.channel }} build --tests --target ${{ matrix.target }}
       - run: cargo +${{ matrix.channel }} test --target ${{ matrix.target }}
diff --git a/src/bindings/cryptography.rs b/src/bindings/cryptography.rs
@@ -457,7 +457,7 @@ pub struct CRYPT_PRIVATE_KEY_INFO {
     pub pAttributes: *mut CRYPT_ATTRIBUTES,
 }
 
-//#[link(name = "crypt32")]
+#[link(name = "windows")] // crypt32
 extern "system" {
     pub fn CertDuplicateCertificateChain(
         pChainContext: *const CERT_CHAIN_CONTEXT,
@@ -634,7 +634,7 @@ extern "system" {
     ) -> *mut CERT_CONTEXT;
 }
 
-//#[link(name = "advapi32")]
+#[link(name = "windows")] // advapi32
 extern "system" {
     pub fn CryptReleaseContext(hProv: usize, dwFlags: u32) -> BOOL;
     pub fn CryptImportKey(

diff --git a/src/bindings/identity.rs b/src/bindings/identity.rs
@@ -148,7 +148,7 @@ pub type SEC_GET_KEY_FN = Option<
     ),
 >;
 
-//#[link(name = "secur32")]
+#[link(name = "windows")] // secur32
 extern "system" {
     pub fn AcquireCredentialsHandleA(
         pszPrincipal: *const u8,

diff --git a/src/crypt_prov.rs b/src/crypt_prov.rs
@@ -173,7 +173,7 @@ impl ProviderType {
     }
 }
 
-//#[link(name = "kernel32")]
+#[link(name = "windows")] // kernel3
 extern "system" {
     fn LocalFree(hMem: isize) -> isize;
 }

diff --git a/src/ncrypt_key.rs b/src/ncrypt_key.rs
@@ -7,7 +7,7 @@ pub struct NcryptKey(Cryptography::NCRYPT_KEY_HANDLE);
 
 impl Drop for NcryptKey {
     fn drop(&mut self) {
-        //#[link(name = "ncrypt")]
+        #[link(name = "windows")] // ncrypt
         extern "system" {
             pub fn NCryptFreeObject(hObject: usize) -> i32;
         }

diff --git a/src/test.rs b/src/test.rs
@@ -34,7 +34,7 @@ mod time {
         pub dwLowDateTime: u32,
         pub dwHighDateTime: u32,
     }
-    //#[link(name = "kernel32")]
+    #[link(name = "windows")] // kernel32
     extern "system" {
         pub fn GetSystemTime(lpSystemTime: *mut SYSTEMTIME);
         pub fn SystemTimeToFileTime(
@@ -76,7 +76,7 @@ mod test_bindings {
         pub rgExtension: *mut CERT_EXTENSION,
     }
 
-    //#[link(name = "crypt32")]
+    #[link(name = "windows")] // crypt32
     extern "system" {
         pub fn CertCreateSelfSignCertificate(
             hCryptProvOrNCryptKey: HCRYPTPROV_OR_NCRYPT_KEY_HANDLE,
@@ -100,7 +100,7 @@ mod test_bindings {
         ) -> BOOL;
     }
 
-    //#[link(name = "advapi32")]
+    #[link(name = "windows")] // advapi32
     extern "system" {
         pub fn CryptGenKey(
             hProv: usize,
@@ -633,7 +633,7 @@ test suite with SCHANNEL_RS_SKIP_SERVER_TESTS=1.
 }
 
 fn local_root_store() -> CertStore {
-    if env::var("APPVEYOR").is_ok() {
+    if env::var("APPVEYOR").is_ok() || env::var("CI").is_ok() {
         CertStore::open_local_machine("Root").unwrap()
     } else {
         CertStore::open_current_user("Root").unwrap()