aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #507 from alex/changelogDonald Stufft2014-01-241-0/+1
|\
| * Added thread safety to the changelogAlex Gaynor2014-01-241-0/+1
|/
* Merge pull request #492 from public/py-thread-safeAlex Gaynor2014-01-245-1/+146
|\
| * Remove the contenious test of contentionAlex Stapleton2014-01-241-46/+0
| * BackticksAlex Stapleton2014-01-241-2/+2
| * Split a test in halfAlex Stapleton2014-01-241-6/+18
| * Some docsAlex Stapleton2014-01-241-0/+20
| * Also test the locking cb directlyAlex Stapleton2014-01-241-19/+20
| * Python implementation of OpenSSL locking callbackAlex Stapleton2014-01-244-1/+159
* | Merge pull request #505 from alex/system-errorPaul Kehrer2014-01-245-13/+22
|\ \
| * | Typo fixAlex Gaynor2014-01-241-2/+2
| * | Switch to using our own InternalError, instead of SystemErrorAlex Gaynor2014-01-245-13/+22
|/ /
* | Merge pull request #504 from alex/syntax-highlightPaul Kehrer2014-01-241-6/+12
|\ \
| * | Mark that tehse are console sections so they syntax highlightAlex Gaynor2014-01-241-6/+12
|/ /
* | Merge pull request #450 from reaperhulk/fix-444Alex Gaynor2014-01-241-0/+15
|\ \ | |/ |/|
| * add instructions on how to install openssl via homebrewPaul Kehrer2014-01-241-2/+5
| * add env so homebrew instructions work in fish as well as bash on OS XPaul Kehrer2014-01-241-1/+2
| * add doc info about how to link against homebrew OpenSSL on OS XPaul Kehrer2014-01-241-0/+11
|/
* Merge pull request #499 from alex/windows-opensslPaul Kehrer2014-01-231-0/+9
|\
| * Link the official pageAlex Gaynor2014-01-231-1/+1
| * Document where to get OpenSSL on windowsAlex Gaynor2014-01-231-0/+9
* | Merge pull request #322 from reaperhulk/windows-supportAlex Gaynor2014-01-233-1/+11
|\ \
| * | add windows support to changelogPaul Kehrer2014-01-231-0/+1
| * | remove advapi32 until we need it (for cryptgenrandom)Paul Kehrer2014-01-231-1/+1
| * | add library switch for windows supportPaul Kehrer2014-01-232-1/+10
|/ /
* | Merge pull request #500 from dreid/hkdf-vectorsPaul Kehrer2014-01-232-0/+82
|\ \
| * | SHA256 vectors.David Reid2014-01-231-0/+34
| * | Add HKDF vectors from RFC5869.David Reid2014-01-231-0/+48
| |/
* | Merge pull request #501 from alex/document-primitivesDonald Stufft2014-01-231-0/+17
|\ \ | |/ |/|
| * DOcument the primitives used in FernetAlex Gaynor2014-01-231-0/+17
|/
* Merge pull request #498 from alex/redirectPaul Kehrer2014-01-231-1/+1
|\
| * Capital S is the canonical URLAlex Gaynor2014-01-231-1/+1
|/
* Merge pull request #497 from reaperhulk/pbkdf2-commoncrypto-bindingsAlex Gaynor2014-01-232-0/+49
|\
| * add commoncrypto PBKDF2 bindingsPaul Kehrer2014-01-222-0/+49
* | Merge pull request #496 from reaperhulk/pbkdf2-openssl-bindingsAlex Gaynor2014-01-231-0/+17
|\ \ | |/ |/|
| * add PBKDF2 from OpenSSL (for future KDF to live alongside HKDF)Paul Kehrer2014-01-221-0/+17
|/
* Merge pull request #495 from reaperhulk/commoncrypto-gcm-backendDavid Reid2014-01-223-10/+120
|\
| * comma for flairPaul Kehrer2014-01-221-1/+1
| * remove encrypt/decrypt attributes on CommonCrypto cipher classesPaul Kehrer2014-01-221-16/+11
| * GCM support for CommonCrypto backendPaul Kehrer2014-01-222-7/+117
| * add kCCModeGCMPaul Kehrer2014-01-221-0/+5
|/
* Merge pull request #494 from reaperhulk/commoncrypto-gcm-bindingsAlex Gaynor2014-01-221-0/+9
|\
| * GCM bindings for CommonCryptoPaul Kehrer2014-01-221-0/+9
|/
* Merge pull request #493 from reaperhulk/aes-keywrap-bindingsAlex Gaynor2014-01-222-0/+41
|\
| * support for aes keywrap (RFC 3394) in the bindingsPaul Kehrer2014-01-222-0/+41
|/
* Merge pull request #491 from alex/setuptools-installedDonald Stufft2014-01-201-2/+0
|\
| * Starting now, setuptools should come with pip *fingerscrossed*Alex Gaynor2014-01-201-2/+0
|/
* Merge pull request #486 from reaperhulk/commoncrypto-cipher-backendAlex Gaynor2014-01-203-2/+238
|\
| * missed one. of course.Paul Kehrer2014-01-201-1/+2
| * style nit fixPaul Kehrer2014-01-201-4/+8