aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1242 from reaperhulk/update-052-changelogAlex Gaynor2014-07-101-0/+8
|\
| * add 0.5.2 changelog to master (backport from 0.5.x branch)Paul Kehrer2014-07-091-0/+8
* | Merge pull request #1237 from reaperhulk/fix-1229Alex Gaynor2014-07-101-2/+0
|\ \ | |/ |/|
| * fix compilation of commoncrypto backend under 10.8Paul Kehrer2014-07-091-2/+0
* | Merge pull request #1236 from reaperhulk/fix-1234Alex Stapleton2014-07-092-2/+31
|\ \ | |/ |/|
| * add TraditionalOpenSSLSerializationBackend to MultiBackendPaul Kehrer2014-07-092-2/+31
|/
* Merge pull request #1232 from alex/simplify2Paul Kehrer2014-07-082-72/+70
|\
| * Factor out a function from key loadingAlex Gaynor2014-07-082-72/+70
|/
* Merge pull request #1225 from alex/deprecationAlex Stapleton2014-07-086-120/+33
|\
| * Added a changelog entryAlex Gaynor2014-07-081-0/+5
| * Merge branch 'master' into deprecationAlex Gaynor2014-07-086-4/+42
| |\
| * | Restore these testsAlex Gaynor2014-07-071-0/+11
| * | This is unusedAlex Gaynor2014-07-071-3/+0
| * | Unused importAlex Gaynor2014-07-071-2/+0
| * | Advanced and remove the deprecated MGF1 sale length codeAlex Gaynor2014-07-075-125/+27
* | | Merge pull request #1228 from Ayrx/remove-merge-leftoversPaul Kehrer2014-07-081-1/+0
|\ \ \ | |_|/ |/| |
| * | Remove merge leftoversTerry Chia2014-07-081-1/+0
|/ /
* | Merge pull request #1227 from reaperhulk/open-for-businessAlex Stapleton2014-07-083-2/+7
|\ \
| * | open master for development on the sixth releasePaul Kehrer2014-07-073-2/+7
|/ /
* | Merge pull request #1226 from reaperhulk/lets-do-051Alex Gaynor2014-07-073-2/+9
|\ \
| * | 0.5.1 version bumpPaul Kehrer2014-07-073-2/+9
|/ /
* | Merge pull request #1222 from reaperhulk/add-pkcs8serialization-multibackendAlex Gaynor2014-07-073-2/+28
|\ \ | |/ |/|
| * remove unneeded try/catchPaul Kehrer2014-07-071-4/+1
| * change some nomenclaturePaul Kehrer2014-07-073-4/+4
| * add PKCS8SerializationBackend support to MultiBackendPaul Kehrer2014-07-073-2/+31
|/
* Merge pull request #1219 from reaperhulk/increment-version-0.5David Reid2014-07-073-6/+4
|\
| * update to version 0.5Paul Kehrer2014-07-073-6/+4
* | Merge pull request #1213 from reaperhulk/update-release-docsAlex Stapleton2014-07-071-4/+19
|\ \ | |/ |/|
| * expand the release instructions to check windows wheel linkingPaul Kehrer2014-07-061-4/+12
| * add openssl version check instructions to release docsPaul Kehrer2014-07-041-2/+9
* | Merge pull request #1218 from Ayrx/update-security-docPaul Kehrer2014-07-071-0/+10
|\ \
| * | Update security.rst to note that we statically link OpenSSL now.Terry Chia2014-07-071-0/+10
* | | Merge pull request #1217 from reaperhulk/add-static-to-changelogAlex Stapleton2014-07-061-0/+4
|\ \ \ | |/ / |/| |
| * | wordsmithingPaul Kehrer2014-07-061-1/+1
| * | add windows static build info to the changelog. fixes #1216Paul Kehrer2014-07-061-0/+4
|/ /
* | Merge pull request #1206 from reaperhulk/static-windows-buildsAlex Stapleton2014-07-063-8/+53
|\ \
| * | change env variable name, handle empty stringPaul Kehrer2014-07-053-6/+8
| * | improve unit tests for _get_windows_librariesPaul Kehrer2014-07-031-2/+2
| * | switch to env variable based static/dynamic switch for windowsPaul Kehrer2014-07-023-8/+41
| * | don't need libraries twice.Paul Kehrer2014-06-301-1/+0
| * | switch to static linking on windows and update installation pagePaul Kehrer2014-06-302-6/+17
* | | Merge pull request #1214 from Ayrx/lol-consistencyAlex Stapleton2014-07-061-0/+1
|\ \ \ | |_|/ |/| |
| * | Add newline for consistencyTerry Chia2014-07-061-0/+1
|/ /
* | Merge pull request #1212 from reaperhulk/improve-ec-docsAlex Gaynor2014-07-043-36/+39
|\ \
| * | Improve EC docsPaul Kehrer2014-07-043-36/+39
|/ /
* | Merge pull request #1195 from public/ec-safety-docsPaul Kehrer2014-07-032-6/+25
|\ \
| * | Advice on choosing a curveAlex Stapleton2014-07-032-6/+25
* | | Merge pull request #1211 from Ayrx/use-stdlib-constant-compareAlex Stapleton2014-07-031-3/+13
|\ \ \
| * | | Added preference for stdlib's compare_digest to constant_timeTerry Chia2014-07-031-3/+13
|/ / /
* | | Merge pull request #1208 from reaperhulk/add-cc-bindingAlex Gaynor2014-07-021-0/+1
|\ \ \