aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #2633 from reaperhulk/travis-sed-thingAlex Gaynor2016-01-031-0/+5
|\ \ | |/ |/| sed the openssl makefile to change the shlib version
| * more review commentsPaul Kehrer2016-01-031-3/+4
| |
| * match a bit more robustlyPaul Kehrer2016-01-031-3/+3
| |
| * sed the openssl makefile to change the shlib versionPaul Kehrer2016-01-031-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-shellPaul Kehrer2016-01-031-1/+1
|\ \ | |/ |/| Backticks are apparently legacy.
| * Backticks are apparently legacy.Alex Gaynor2016-01-031-1/+1
|/ | | | I just do what shellcheck tells me
* Merge pull request #2632 from alex/quotingPaul Kehrer2016-01-032-2/+2
|\ | | | | Quote a few things that shellcheck suggests
| * Quote a few things that shellcheck suggestsAlex Gaynor2016-01-032-2/+2
|/
* Merge pull request #2629 from reaperhulk/travis-refactorAlex Gaynor2016-01-032-24/+24
|\ | | | | refactor travis custom openssl code to work with other versions
| * use -n instead of ! -zPaul Kehrer2016-01-032-2/+2
| |
| * refactor travis custom openssl code to work with other versionsPaul Kehrer2016-01-032-24/+24
| |
* | Merge pull request #2631 from alex/remove-hackPaul Kehrer2016-01-031-6/+0
|\ \ | | | | | | Remove lucid hack, this should our custom OpenSSL compilation
| * | Remove lucid hack, this should our custom OpenSSL compilationAlex Gaynor2016-01-031-6/+0
|/ /
* | Merge pull request #2630 from reaperhulk/travis-update-osxAlex Gaynor2016-01-031-10/+13
|\ \ | | | | | | update osx_image values based on travis supported versions
| * | update osx_image values based on travis supported versionsPaul Kehrer2016-01-021-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-osxAlex Gaynor2016-01-031-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 travisPaul Kehrer2016-01-021-0/+3
|/
* Merge pull request #2553 from reaperhulk/098-changeAlex Gaynor2016-01-023-30/+29
|\ | | | | Build our own 0.9.8 on travis
| * be less verbose when untarringPaul Kehrer2016-01-021-1/+1
| |
| * rename 098 directory in CI to 098lPaul Kehrer2016-01-023-11/+11
| |
| * make this 0.9.8l and cryPaul Kehrer2015-12-271-5/+8
| |
| * tree isn't availablePaul Kehrer2015-12-231-1/+0
| |
| * 0.9.8 experiment for travisPaul Kehrer2015-12-233-30/+27
| |
* | Merge pull request #2626 from reaperhulk/dstufft-also-annoyed-by-mentionbotAlex Gaynor2016-01-021-1/+1
|\ \ | | | | | | @dstufft is also annoyed by the mentionbot
| * | @dstufft is also annoyed by the mentionbotPaul Kehrer2016-01-021-1/+1
|/ /
* | Merge pull request #2624 from alex/2016Paul Kehrer2016-01-013-3/+3
|\ \ | | | | | | Bump the copyright year
| * | Bump the copyright yearAlex Gaynor2016-01-013-3/+3
| | |
* | | Merge pull request #2617 from reaperhulk/compiler-mingw-why-notAlex Gaynor2016-01-014-14/+29
|\ \ \ | | | | | | | | don't add the NXCOMPAT and DYNAMICBASE flags if the compiler isn't msvc
| * | | convert other extra_link_args callsPaul Kehrer2016-01-012-6/+4
| | | |
| * | | don't add the NXCOMPAT and DYNAMICBASE flags if the compiler isn't msvcPaul Kehrer2016-01-012-8/+25
| | | |
* | | | Merge pull request #2621 from reaperhulk/update-linksAlex Gaynor2016-01-013-4/+4
|\ \ \ \ | | | | | | | | | | update some links with the redirects shown in the linkchecker
| * | | | update some links with the redirects shown in the linkcheckerPaul Kehrer2016-01-013-4/+4
| | | | |
* | | | | Merge pull request #2618 from reaperhulk/fix-2432Alex Gaynor2016-01-011-2/+4
|\ \ \ \ \ | | | | | | | | | | | | provide a bit more detail about the underlying public key formats
| * | | | | provide a bit more detail about the underlying public key formatsPaul Kehrer2015-12-311-2/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #2616 from reaperhulk/docs-accurate-osxAlex Gaynor2016-01-011-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | make the os x install docs more accurate
| * | | | disambiguate a version numberPaul Kehrer2015-12-311-2/+2
| | | | |
| * | | | make the os x install docs more accuratePaul Kehrer2015-12-311-3/+3
| |/ / /
* | | | Merge pull request #2620 from reaperhulk/opt-out-exarkunJean-Paul Calderone2016-01-011-1/+1
|\ \ \ \
| * | | | @exarkun has requested that he be removed from mention-botPaul Kehrer2016-01-011-1/+1
|/ / / /
* | | | Merge pull request #2615 from reaperhulk/doc-deprecationsAlex Gaynor2016-01-011-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 deprecationsPaul Kehrer2015-12-311-0/+9
| |/ / /
* | | | Merge pull request #2614 from reaperhulk/doc-wheel-cacheAlex Gaynor2016-01-011-0/+6
|\ \ \ \ | |/ / / |/| | | add a small note about clearing the wheel cache
| * | | add a small note about clearing the wheel cachePaul Kehrer2015-12-311-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-101Alex Gaynor2015-12-312-0/+13
|\ \ \ | | | | | | | | deprecationwarning for OpenSSL < 1.0.1 as upstream has dropped support
| * | | add changelog entry for 0.9.8/1.0.0 deprecationPaul Kehrer2015-12-311-0/+4
| | | |
| * | | deprecationwarning for OpenSSL < 1.0.1 as upstream has dropped supportPaul Kehrer2015-12-311-0/+9
| | | |
* | | | Merge pull request #2607 from reaperhulk/unrecognized-extension-support-reduxAlex Gaynor2015-12-315-5/+37
|\ \ \ \ | |_|/ / |/| | | support unrecognized extensions in x509
| * | | backticksPaul Kehrer2015-12-301-1/+1
| | | |
| * | | support unrecognized extensions in x509Paul Kehrer2015-12-305-5/+37
| |/ /
* | | Merge pull request #2609 from reaperhulk/extension-for-class-exceptionAlex Gaynor2015-12-302-0/+12
|\ \ \ | | | | | | | | don't allow UnrecognizedExtension with get_extension_for_class