Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #2633 from reaperhulk/travis-sed-thing | Alex Gaynor | 2016-01-03 | 1 | -0/+5 | |
|\ \ | |/ |/| | sed the openssl makefile to change the shlib version | |||||
| * | more review comments | Paul Kehrer | 2016-01-03 | 1 | -3/+4 | |
| | | ||||||
| * | match a bit more robustly | Paul Kehrer | 2016-01-03 | 1 | -3/+3 | |
| | | ||||||
| * | sed the openssl makefile to change the shlib version | Paul Kehrer | 2016-01-03 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this to prevent a version collision between the custom one we're installing and whatever the system has. OpenSSL 1.0.0 through 1.0.2 all declare an SHLIB version of 1.0.0, so if Python has been linked against 1.0.1 and cryptography against 1.0.0, but then you try to load Python it will consider either 1.0.1 or 1.0.0 to satisfy the library version. This is, of course, nonsense since 1.0.1 has substantially more symbols than 1.0.0. The result is that if you do a LD_LIBRARY_PATH that points at the "real" 1.0.0 then Python will fail to load because there are missing symbols. We can avoid this entire nonsense by changing the major version. The dynamic linker will happily load both versions and nothing will kerplode. | |||||
* | | Merge pull request #2634 from alex/avoid-legacy-shell | Paul Kehrer | 2016-01-03 | 1 | -1/+1 | |
|\ \ | |/ |/| | Backticks are apparently legacy. | |||||
| * | Backticks are apparently legacy. | Alex Gaynor | 2016-01-03 | 1 | -1/+1 | |
|/ | | | | I just do what shellcheck tells me | |||||
* | Merge pull request #2632 from alex/quoting | Paul Kehrer | 2016-01-03 | 2 | -2/+2 | |
|\ | | | | | Quote a few things that shellcheck suggests | |||||
| * | Quote a few things that shellcheck suggests | Alex Gaynor | 2016-01-03 | 2 | -2/+2 | |
|/ | ||||||
* | Merge pull request #2629 from reaperhulk/travis-refactor | Alex Gaynor | 2016-01-03 | 2 | -24/+24 | |
|\ | | | | | refactor travis custom openssl code to work with other versions | |||||
| * | use -n instead of ! -z | Paul Kehrer | 2016-01-03 | 2 | -2/+2 | |
| | | ||||||
| * | refactor travis custom openssl code to work with other versions | Paul Kehrer | 2016-01-03 | 2 | -24/+24 | |
| | | ||||||
* | | Merge pull request #2631 from alex/remove-hack | Paul Kehrer | 2016-01-03 | 1 | -6/+0 | |
|\ \ | | | | | | | Remove lucid hack, this should our custom OpenSSL compilation | |||||
| * | | Remove lucid hack, this should our custom OpenSSL compilation | Alex Gaynor | 2016-01-03 | 1 | -6/+0 | |
|/ / | ||||||
* | | Merge pull request #2630 from reaperhulk/travis-update-osx | Alex Gaynor | 2016-01-03 | 1 | -10/+13 | |
|\ \ | | | | | | | update osx_image values based on travis supported versions | |||||
| * | | update osx_image values based on travis supported versions | Paul Kehrer | 2016-01-02 | 1 | -10/+13 | |
| |/ | | | | | | | https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions | |||||
* | | Merge pull request #2628 from reaperhulk/travis-reduce-osx | Alex Gaynor | 2016-01-03 | 1 | -0/+3 | |
|\ \ | |/ |/| | don't test CC on a dynamic link build on OS X travis | |||||
| * | don't test CC on a dynamic link build on OS X travis | Paul Kehrer | 2016-01-02 | 1 | -0/+3 | |
|/ | ||||||
* | Merge pull request #2553 from reaperhulk/098-change | Alex Gaynor | 2016-01-02 | 3 | -30/+29 | |
|\ | | | | | Build our own 0.9.8 on travis | |||||
| * | be less verbose when untarring | Paul Kehrer | 2016-01-02 | 1 | -1/+1 | |
| | | ||||||
| * | rename 098 directory in CI to 098l | Paul Kehrer | 2016-01-02 | 3 | -11/+11 | |
| | | ||||||
| * | make this 0.9.8l and cry | Paul Kehrer | 2015-12-27 | 1 | -5/+8 | |
| | | ||||||
| * | tree isn't available | Paul Kehrer | 2015-12-23 | 1 | -1/+0 | |
| | | ||||||
| * | 0.9.8 experiment for travis | Paul Kehrer | 2015-12-23 | 3 | -30/+27 | |
| | | ||||||
* | | Merge pull request #2626 from reaperhulk/dstufft-also-annoyed-by-mentionbot | Alex Gaynor | 2016-01-02 | 1 | -1/+1 | |
|\ \ | | | | | | | @dstufft is also annoyed by the mentionbot | |||||
| * | | @dstufft is also annoyed by the mentionbot | Paul Kehrer | 2016-01-02 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2624 from alex/2016 | Paul Kehrer | 2016-01-01 | 3 | -3/+3 | |
|\ \ | | | | | | | Bump the copyright year | |||||
| * | | Bump the copyright year | Alex Gaynor | 2016-01-01 | 3 | -3/+3 | |
| | | | ||||||
* | | | Merge pull request #2617 from reaperhulk/compiler-mingw-why-not | Alex Gaynor | 2016-01-01 | 4 | -14/+29 | |
|\ \ \ | | | | | | | | | don't add the NXCOMPAT and DYNAMICBASE flags if the compiler isn't msvc | |||||
| * | | | convert other extra_link_args calls | Paul Kehrer | 2016-01-01 | 2 | -6/+4 | |
| | | | | ||||||
| * | | | don't add the NXCOMPAT and DYNAMICBASE flags if the compiler isn't msvc | Paul Kehrer | 2016-01-01 | 2 | -8/+25 | |
| | | | | ||||||
* | | | | Merge pull request #2621 from reaperhulk/update-links | Alex Gaynor | 2016-01-01 | 3 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | update some links with the redirects shown in the linkchecker | |||||
| * | | | | update some links with the redirects shown in the linkchecker | Paul Kehrer | 2016-01-01 | 3 | -4/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #2618 from reaperhulk/fix-2432 | Alex Gaynor | 2016-01-01 | 1 | -2/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | provide a bit more detail about the underlying public key formats | |||||
| * | | | | | provide a bit more detail about the underlying public key formats | Paul Kehrer | 2015-12-31 | 1 | -2/+4 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2616 from reaperhulk/docs-accurate-osx | Alex Gaynor | 2016-01-01 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | make the os x install docs more accurate | |||||
| * | | | | disambiguate a version number | Paul Kehrer | 2015-12-31 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | make the os x install docs more accurate | Paul Kehrer | 2015-12-31 | 1 | -3/+3 | |
| |/ / / | ||||||
* | | | | Merge pull request #2620 from reaperhulk/opt-out-exarkun | Jean-Paul Calderone | 2016-01-01 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | @exarkun has requested that he be removed from mention-bot | Paul Kehrer | 2016-01-01 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #2615 from reaperhulk/doc-deprecations | Alex Gaynor | 2016-01-01 | 1 | -0/+9 | |
|\ \ \ \ | | | | | | | | | | | prominently note our py2.6 and openssl 0.9.8/1.0.0 deprecations | |||||
| * | | | | prominently note our py2.6 and openssl 0.9.8/1.0.0 deprecations | Paul Kehrer | 2015-12-31 | 1 | -0/+9 | |
| |/ / / | ||||||
* | | | | Merge pull request #2614 from reaperhulk/doc-wheel-cache | Alex Gaynor | 2016-01-01 | 1 | -0/+6 | |
|\ \ \ \ | |/ / / |/| | | | add a small note about clearing the wheel cache | |||||
| * | | | add a small note about clearing the wheel cache | Paul Kehrer | 2015-12-31 | 1 | -0/+6 | |
|/ / / | | | | | | | | | | | | | | | | When compiling cryptography yourself if you have a problem and need to recompile but the wheel built successfully you need to know to clear the wheel cache. This is an edge case but worth documenting. Fixes #2006 | |||||
* | | | Merge pull request #2613 from reaperhulk/warn-on-openssl-lt-101 | Alex Gaynor | 2015-12-31 | 2 | -0/+13 | |
|\ \ \ | | | | | | | | | deprecationwarning for OpenSSL < 1.0.1 as upstream has dropped support | |||||
| * | | | add changelog entry for 0.9.8/1.0.0 deprecation | Paul Kehrer | 2015-12-31 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | deprecationwarning for OpenSSL < 1.0.1 as upstream has dropped support | Paul Kehrer | 2015-12-31 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | Merge pull request #2607 from reaperhulk/unrecognized-extension-support-redux | Alex Gaynor | 2015-12-31 | 5 | -5/+37 | |
|\ \ \ \ | |_|/ / |/| | | | support unrecognized extensions in x509 | |||||
| * | | | backticks | Paul Kehrer | 2015-12-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | support unrecognized extensions in x509 | Paul Kehrer | 2015-12-30 | 5 | -5/+37 | |
| |/ / | ||||||
* | | | Merge pull request #2609 from reaperhulk/extension-for-class-exception | Alex Gaynor | 2015-12-30 | 2 | -0/+12 | |
|\ \ \ | | | | | | | | | don't allow UnrecognizedExtension with get_extension_for_class |