aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #446 from alex/docs-fixupPaul Kehrer2014-01-091-3/+3
|\
| * Fix up a mistaken copy pasteAlex Gaynor2014-01-091-3/+3
|/
* Merge pull request #405 from reaperhulk/common-crypto-bindingAlex Gaynor2014-01-096-0/+186
|\
| * Merge branch 'master' into common-crypto-bindingPaul Kehrer2014-01-093-19/+25
| |\ | |/ |/|
* | Merge pull request #445 from reaperhulk/more-travis-pokingAlex Gaynor2014-01-091-13/+19
|\ \
| * | temporary workaround for travis-ci bugPaul Kehrer2014-01-091-13/+19
|/ /
* | Merge pull request #443 from alex/no-easy-installPaul Kehrer2014-01-092-3/+5
|\ \
| * | Style nitAlex Gaynor2014-01-091-1/+1
| * | easy_install is awful, don't use itAlex Gaynor2014-01-091-2/+4
* | | Merge pull request #441 from alex/authorsDavid Reid2014-01-091-3/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into authorsAlex Gaynor2014-01-092-14/+153
| |\ \ | |/ / |/| |
| * | Simplify the authors sectionAlex Gaynor2014-01-091-3/+1
| | * refactor commoncrypto's is_available to check platform for nowPaul Kehrer2014-01-091-4/+4
| | * add CommonCrypto binding docsPaul Kehrer2014-01-092-0/+29
| | * add is_available() to CommonCrypto binding, use it for skipifPaul Kehrer2014-01-092-4/+11
| | * cover a missing branch in the commoncrypto bindingsPaul Kehrer2014-01-091-2/+8
| | * Add initial CommonCrypto bindings (no backend yet)Paul Kehrer2014-01-094-0/+144
| |/ |/|
* | Merge pull request #425 from reaperhulk/travis-me-tooDavid Reid2014-01-092-14/+153
|\ \ | |/ |/|
| * add comment about why the travis exclude matrix is so largePaul Kehrer2014-01-081-0/+4
| * support osx and linux on travisPaul Kehrer2014-01-082-14/+149
* | Merge pull request #440 from public/vanityHynek Schlawack2014-01-091-1/+1
|\ \
| * | Add myself to __authors__Alex Stapleton2014-01-091-1/+1
|/ /
* | Merge pull request #439 from reaperhulk/hmac-verify-textAlex Gaynor2014-01-081-3/+2
|\ \
| * | rewrite some text about the hmac verify methodPaul Kehrer2014-01-081-3/+2
|/ /
* | Merge pull request #435 from reaperhulk/0.2-dev-openDavid Reid2014-01-082-1/+5
|\ \
| * | add 0.2 changelog sectionPaul Kehrer2014-01-081-0/+4
| * | update version to 0.2.dev1 in masterPaul Kehrer2014-01-081-1/+1
* | | Merge pull request #438 from alex/more-prominent-verifyDavid Reid2014-01-081-11/+22
|\ \ \
| * | | Make verify on HMAC more prominentAlex Gaynor2014-01-081-11/+22
* | | | Merge pull request #437 from rgbkrk/eggiePaul Kehrer2014-01-081-4/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Ignore all eggsKyle Kelley2014-01-081-4/+1
|/ / /
* | | Merge pull request #434 from rgbkrk/minusixAlex Gaynor2014-01-081-0/+1
|\ \ \
| * | | Ignore six eggs, not a full dozenKyle Kelley2014-01-081-0/+1
* | | | Merge pull request #433 from alex/pip-install-me-captainDavid Reid2014-01-081-3/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Document that we're on PyPIAlex Gaynor2014-01-081-3/+2
* | | | Merge pull request #431 from dreid/release-0.1Alex Gaynor2014-01-082-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Prepare to release.David Reid2014-01-082-2/+2
| |/ /
* | | Merge pull request #432 from dreid/blame-dreidAlex Gaynor2014-01-081-0/+1
|\ \ \ | |/ / |/| |
| * | I guess I should take some of the blame.David Reid2014-01-081-0/+1
|/ /
* | Merge pull request #429 from alex/changelogDavid Reid2014-01-084-0/+11
|\ \
| * | ReformatAlex Gaynor2014-01-081-4/+2
| * | Typo fixAlex Gaynor2014-01-081-1/+1
| * | Fixed #428 -- added a changelogAlex Gaynor2014-01-084-0/+13
|/ /
* | Merge pull request #424 from reaperhulk/padding-info-for-allAlex Gaynor2014-01-071-2/+14
|\ \
| * | add padding info to docsPaul Kehrer2014-01-071-2/+14
| |/
* | Merge pull request #423 from alex/ignorePaul Kehrer2014-01-071-3/+3
|\ \ | |/ |/|
| * These eggs are sometimes files. We still don't care.Alex Gaynor2014-01-071-3/+3
|/
* Merge pull request #418 from reaperhulk/move-contextsDavid Reid2014-01-071-73/+83
|\
| * move ciphercontext/aeadciphercontext to bottom of symmetric encryptionPaul Kehrer2014-01-071-73/+83
* | Merge pull request #419 from reaperhulk/gcm-no-pad-requiredAlex Gaynor2014-01-071-15/+5
|\ \ | |/ |/|