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 platform check to set library names for linking on windows #322

Merged
merged 3 commits into from Jan 24, 2014

Conversation

reaperhulk
Copy link
Member

This is the last patch required to make windows work. This will drop our coverage <100% until we enable a windows build slave (and figure out how to get it integrated with coveralls)

@alex
Copy link
Member

alex commented Dec 20, 2013

We should get the Windows ci stuff sorted before this can be merged.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.07%) when pulling 3e14369 on reaperhulk:windows-support into cde832d on pyca:master.

@jenkins-cryptography
Copy link

Test PASSed.
Refer to this link for build results: http://jenkins.cryptography.io/job/cryptography-pr-experimental/11/

@jenkins-cryptography
Copy link

Test FAILed.
Refer to this link for build results: http://jenkins.cryptography.io/job/cryptography-pr-experimental/443/

Temporarily using pragma: no cover on it until we have windows coverage
on travis. Windows builds will be done via jenkins for now.
@jenkins-cryptography
Copy link

Test FAILed.
Refer to this link for build results: http://jenkins.cryptography.io/job/cryptography-pr-experimental/445/

if sys.platform != "win32":
libraries = ["crypto", "ssl"]
else: # pragma: no cover
libraries = ["libeay32", "ssleay32", "advapi32"]
Copy link
Member

Choose a reason for hiding this comment

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

I'm afraid to ask, but why do we need "advapi32"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh I can actually remove that until we land the os random engine. advapi32 is for cryptgenrandom.

Copy link
Member

Choose a reason for hiding this comment

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

Sounds good. (I hate everything)

On Thu, Jan 23, 2014 at 8:19 PM, Paul Kehrer notifications@github.comwrote:

In cryptography/hazmat/bindings/openssl/binding.py:

@@ -79,9 +81,15 @@ def _ensure_ffi_initialized(cls):
if cls.ffi is not None and cls.lib is not None:
return

  •    # platform check to set the right library names
    
  •    if sys.platform != "win32":
    
  •        libraries = ["crypto", "ssl"]
    
  •    else:  # pragma: no cover
    
  •        libraries = ["libeay32", "ssleay32", "advapi32"]
    

Oh I can actually remove that until we land the os random engine. advapi32
is for cryptgenrandom.


Reply to this email directly or view it on GitHubhttps://github.com//pull/322/files#r9138609
.

"I disapprove of what you say, but I will defend to the death your right to
say it." -- Evelyn Beatrice Hall (summarizing Voltaire)
"The people's good is the highest law." -- Cicero
GPG Key fingerprint: 125F 5C67 DFE9 4084

@alex
Copy link
Member

alex commented Jan 24, 2014

Can you add windows support to the changelog?

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling f84ca67 on reaperhulk:windows-support into 46ffbfb on pyca:master.

@jenkins-cryptography
Copy link

Test PASSed.
Refer to this link for build results: http://jenkins.cryptography.io/job/cryptography-pr-experimental/446/

@jenkins-cryptography
Copy link

Test PASSed.
Refer to this link for build results: http://jenkins.cryptography.io/job/cryptography-pr-experimental/447/

@coveralls
Copy link

coveralls commented Jan 24, 2014

Coverage Status

Coverage remained the same at 100.0% when pulling b495790 on reaperhulk:windows-support into 46ffbfb on pyca:master.

alex added a commit that referenced this pull request Jan 24, 2014
add platform check to set library names for linking on windows
@alex alex merged commit 99f9279 into pyca:master Jan 24, 2014
@reaperhulk reaperhulk deleted the windows-support branch January 24, 2014 03:48
joerichter-stash pushed a commit to kiwigrid/cryptography that referenced this pull request Nov 15, 2017
joerichter-stash pushed a commit to kiwigrid/cryptography that referenced this pull request Nov 15, 2017
Fixed pyca#322 -- removed code that already exists in cryptography
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 30, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Development

Successfully merging this pull request may close these issues.

None yet

4 participants