Merge lp://staging/~stepankk/pyopenssl/bug-845445 into lp://staging/~exarkun/pyopenssl/trunk

Proposed by stepankk
Status: Work in progress
Proposed branch: lp://staging/~stepankk/pyopenssl/bug-845445
Merge into: lp://staging/~exarkun/pyopenssl/trunk
Diff against target: 105 lines (+13/-3)
3 files modified
OpenSSL/ssl/connection.c (+6/-0)
OpenSSL/ssl/context.c (+4/-0)
setup.py (+3/-3)
To merge this branch: bzr merge lp://staging/~stepankk/pyopenssl/bug-845445
Reviewer Review Type Date Requested Status
Jean-Paul Calderone Needs Fixing
Review via email: mp+89242@code.staging.launchpad.net

Description of the change

Excluded some parts of C code according to OpenSSL version.

To post a comment you must log in.
Revision history for this message
Jean-Paul Calderone (exarkun) wrote :

Thanks. It looks like this branch does fix the build problems. A few tweaks are probably in order:

  1. The setup.py changes look superfluous. Can you drop them?
  2. 8 unit tests fail with the branch. Unsurprisingly, these are the tests for the APIs being disabled. Can you change the test suite to skip these tests if the version of OpenSSL in use is too old to have them?
  3. Is a version check in the implementation the ideal way to do this? Another approach would be to check if the API symbols themselves are defined. I don't feel too strongly about this either way, I mostly want to see if you considered it or if you have any thoughts on the alternate approach.

Thanks again.

review: Needs Fixing
Revision history for this message
Keshav Kini (keshav-kini) wrote :

See also a patch on the actual bug #845445 page, which checks whether the API symbols themselves are defined, but doesn't skip any unit tests.

Unmerged revisions

166. By stepankk

updated version in setup.py

165. By stepankk

updated version and url in setup.py

164. By stepankk

compatibility with openssl <= 0.9.8.e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: