Skip to content
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

Add NCryptFreeObject #319

Merged
merged 1 commit into from
Oct 30, 2016
Merged

Add NCryptFreeObject #319

merged 1 commit into from
Oct 30, 2016

Conversation

sfackler
Copy link
Contributor

No description provided.

@retep998
Copy link
Owner

Don't forget to add ncrypt to the dev dependencies of winapi so CI can actually test building it.

@sfackler
Copy link
Contributor Author

Fixed!

sfackler added a commit to sfackler/schannel-rs that referenced this pull request Aug 17, 2016
We have to pull some ncrypt stuff in temporarily until
retep998/winapi-rs#319 lands.
@retep998 retep998 changed the base branch from master to dev September 9, 2016 11:20
@retep998 retep998 changed the base branch from dev to master September 9, 2016 11:21
@sfackler
Copy link
Contributor Author

Ping

@retep998
Copy link
Owner

This PR will need to be updated to the winapi 0.3 new world order. #316

@sfackler sfackler changed the base branch from master to dev October 27, 2016 03:23
@sfackler
Copy link
Contributor Author

Updated! The mingw dlls have not been added anywhere since the appropriate crates haven't been created yet.

@retep998
Copy link
Owner

Could you rebase once a nightly comes out with rust-lang/rust#37361 so this PR can be tested properly?

@sfackler
Copy link
Contributor Author

Sure, will do.

@sfackler sfackler force-pushed the patch-2 branch 2 times, most recently from ca30d4a to f4b86ec Compare October 29, 2016 16:11
@sfackler
Copy link
Contributor Author

Updated, but looks like the GNU build is failing due to the missing library shims.

@@ -14,3 +14,4 @@
#[cfg(feature = "um-wincon")] pub mod wincon;
#[cfg(feature = "um-wingdi")] pub mod wingdi;
#[cfg(feature = "um-winnt")] pub mod winnt;
#[cfg(feature = "um-ncrypt")] pub mod ncrypt;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alphabetical order

@@ -69,7 +73,9 @@ headers = ["headers-shared", "headers-um", "headers-vc"]
"vc-vcruntime" = []
libraries = [
"kernel32",
"ole32"
"ole32",
"ncrypt"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alphabetical order

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you might have forgot about this when updating.

@@ -56,6 +59,7 @@ headers = ["headers-shared", "headers-um", "headers-vc"]
"um-combaseapi" = ["shared-basetsd", "shared-minwindef", "shared-wtypesbase", "um-objidlbase", "ole32"]
"um-consoleapi" = ["shared-minwindef", "um-wincon", "um-winnt", "kernel32"]
"um-minwinbase" = ["shared-ntstatus"]
"um-ncrypt" = ["shared-basetsd", "shared-sspi"]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also depend on "ncrypt" because it has functions from that library.

@sfackler
Copy link
Contributor Author

Updated!

@retep998
Copy link
Owner

I added crates in the i686 and x86_64 folders to provide mingw import libraries. Could you put the ncrypt import libraries in there?

@sfackler
Copy link
Contributor Author

Updated!

@retep998 retep998 merged commit 8a148e2 into retep998:dev Oct 30, 2016
@sfackler sfackler deleted the patch-2 branch October 30, 2016 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants