Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #455 from reaperhulk/init-ssl-stuff | Alex Gaynor | 2014-01-10 | 1 | -0/+4 |
|\ | | | | | Init the ssl library in the backend | ||||
| * | init the ssl library in the backend | Paul Kehrer | 2014-01-10 | 1 | -0/+4 |
|/ | | | | Also add some comments since this is mildly convoluted. | ||||
* | Merge pull request #453 from alex/quote | Paul Kehrer | 2014-01-10 | 1 | -1/+1 |
|\ | | | | | Use a normal quote here, not sure where the smart quote came from | ||||
| * | Use a normal quote here, not sure where the smart quote came from | Alex Gaynor | 2014-01-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #452 from hynek/ssl-strings | Donald Stufft | 2014-01-10 | 1 | -0/+1 |
|\ | | | | | Expose ERR_load_SSL_strings | ||||
| * | Expose ERR_load_SSL_strings | Hynek Schlawack | 2014-01-10 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #447 from reaperhulk/test-marks | David Reid | 2014-01-09 | 1 | -0/+50 |
|\ | | | | | Add test marks to fernet so backends without cipher (or AES/CBC) will skip | ||||
| * | add test marks to fernet so backends without cipher (or AES/CBC) will skip | Paul Kehrer | 2014-01-09 | 1 | -0/+50 |
|/ | |||||
* | Merge pull request #446 from alex/docs-fixup | Paul Kehrer | 2014-01-09 | 1 | -3/+3 |
|\ | | | | | Fix up a mistaken copy paste | ||||
| * | Fix up a mistaken copy paste | Alex Gaynor | 2014-01-09 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #405 from reaperhulk/common-crypto-binding | Alex Gaynor | 2014-01-09 | 6 | -0/+186 |
|\ | | | | | CommonCrypto Binding | ||||
| * | Merge branch 'master' into common-crypto-binding | Paul Kehrer | 2014-01-09 | 3 | -19/+25 |
| |\ | |/ |/| | | | | | | | | | | | * master: temporary workaround for travis-ci bug Style nit easy_install is awful, don't use it Simplify the authors section | ||||
* | | Merge pull request #445 from reaperhulk/more-travis-poking | Alex Gaynor | 2014-01-09 | 1 | -13/+19 |
|\ \ | | | | | | | Workaround for travis bug | ||||
| * | | temporary workaround for travis-ci bug | Paul Kehrer | 2014-01-09 | 1 | -13/+19 |
|/ / | | | | | | | bug: https://github.com/travis-ci/travis-ci/issues/1844 | ||||
* | | Merge pull request #443 from alex/no-easy-install | Paul Kehrer | 2014-01-09 | 2 | -3/+5 |
|\ \ | | | | | | | easy_install is awful, don't use it | ||||
| * | | Style nit | Alex Gaynor | 2014-01-09 | 1 | -1/+1 |
| | | | |||||
| * | | easy_install is awful, don't use it | Alex Gaynor | 2014-01-09 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #441 from alex/authors | David Reid | 2014-01-09 | 1 | -3/+1 |
|\ \ \ | |/ / |/| | | Simplify the authors section | ||||
| * | | Merge branch 'master' into authors | Alex Gaynor | 2014-01-09 | 2 | -14/+153 |
| |\ \ | |/ / |/| | | |||||
| * | | Simplify the authors section | Alex Gaynor | 2014-01-09 | 1 | -3/+1 |
| | | | |||||
| | * | refactor commoncrypto's is_available to check platform for now | Paul Kehrer | 2014-01-09 | 1 | -4/+4 |
| | | | |||||
| | * | add CommonCrypto binding docs | Paul Kehrer | 2014-01-09 | 2 | -0/+29 |
| | | | |||||
| | * | add is_available() to CommonCrypto binding, use it for skipif | Paul Kehrer | 2014-01-09 | 2 | -4/+11 |
| | | | |||||
| | * | cover a missing branch in the commoncrypto bindings | Paul Kehrer | 2014-01-09 | 1 | -2/+8 |
| | | | |||||
| | * | Add initial CommonCrypto bindings (no backend yet) | Paul Kehrer | 2014-01-09 | 4 | -0/+144 |
| |/ |/| | |||||
* | | Merge pull request #425 from reaperhulk/travis-me-too | David Reid | 2014-01-09 | 2 | -14/+153 |
|\ \ | |/ |/| | Travis OS X Support | ||||
| * | add comment about why the travis exclude matrix is so large | Paul Kehrer | 2014-01-08 | 1 | -0/+4 |
| | | |||||
| * | support osx and linux on travis | Paul Kehrer | 2014-01-08 | 2 | -14/+149 |
| | | |||||
* | | Merge pull request #440 from public/vanity | Hynek Schlawack | 2014-01-09 | 1 | -1/+1 |
|\ \ | | | | | | | Add Alex Stapleton to __authors__ | ||||
| * | | Add myself to __authors__ | Alex Stapleton | 2014-01-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #439 from reaperhulk/hmac-verify-text | Alex Gaynor | 2014-01-08 | 1 | -3/+2 |
|\ \ | | | | | | | HMAC verify text update | ||||
| * | | rewrite some text about the hmac verify method | Paul Kehrer | 2014-01-08 | 1 | -3/+2 |
|/ / | |||||
* | | Merge pull request #435 from reaperhulk/0.2-dev-open | David Reid | 2014-01-08 | 2 | -1/+5 |
|\ \ | | | | | | | Update version to 0.2.dev1 on master | ||||
| * | | add 0.2 changelog section | Paul Kehrer | 2014-01-08 | 1 | -0/+4 |
| | | | |||||
| * | | update version to 0.2.dev1 in master | Paul Kehrer | 2014-01-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #438 from alex/more-prominent-verify | David Reid | 2014-01-08 | 1 | -11/+22 |
|\ \ \ | | | | | | | | | Make verify on HMAC more prominent | ||||
| * | | | Make verify on HMAC more prominent | Alex Gaynor | 2014-01-08 | 1 | -11/+22 |
| | | | | |||||
* | | | | Merge pull request #437 from rgbkrk/eggie | Paul Kehrer | 2014-01-08 | 1 | -4/+1 |
|\ \ \ \ | |/ / / |/| | | | Ignore all eggs | ||||
| * | | | Ignore all eggs | Kyle Kelley | 2014-01-08 | 1 | -4/+1 |
|/ / / | |||||
* | | | Merge pull request #434 from rgbkrk/minusix | Alex Gaynor | 2014-01-08 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Ignore six eggs, not a full dozen | ||||
| * | | | Ignore six eggs, not a full dozen | Kyle Kelley | 2014-01-08 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #433 from alex/pip-install-me-captain | David Reid | 2014-01-08 | 1 | -3/+2 |
|\ \ \ \ | |_|/ / |/| | | | Document that we're on PyPI | ||||
| * | | | Document that we're on PyPI | Alex Gaynor | 2014-01-08 | 1 | -3/+2 |
| | | | | |||||
* | | | | Merge pull request #431 from dreid/release-0.1 | Alex Gaynor | 2014-01-08 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Prepare to release. | ||||
| * | | | Prepare to release. | David Reid | 2014-01-08 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #432 from dreid/blame-dreid | Alex Gaynor | 2014-01-08 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | I guess I should take some of the blame. | ||||
| * | | I guess I should take some of the blame. | David Reid | 2014-01-08 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #429 from alex/changelog | David Reid | 2014-01-08 | 4 | -0/+11 |
|\ \ | | | | | | | Fixed #428 -- added a changelog | ||||
| * | | Reformat | Alex Gaynor | 2014-01-08 | 1 | -4/+2 |
| | | | |||||
| * | | Typo fix | Alex Gaynor | 2014-01-08 | 1 | -1/+1 |
| | | |