aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into add_name_to_oidsBrendan McCollam2015-09-0715-83/+216
|\
| * Merge pull request #2329 from reaperhulk/changelog-101Alex Gaynor2015-09-051-0/+12
| |\
| | * port 1.0.1 changelog to masterPaul Kehrer2015-09-051-0/+12
| |/
| * Merge pull request #2326 from reaperhulk/osx-static-linking-docsDonald Stufft2015-09-051-14/+41
| |\
| | * rework OS X install docs to describe static/dynamic linkingPaul Kehrer2015-09-051-14/+41
| |/
| * Merge pull request #2306 from reaperhulk/static-linking-osxDonald Stufft2015-09-053-9/+35
| |\
| | * Merge branch 'master' into static-linking-osxPaul Kehrer2015-09-051-22/+24
| | |\ | | |/ | |/|
| * | Merge pull request #2322 from reaperhulk/docs-fixAlex Gaynor2015-09-041-22/+24
| |\ \
| | * \ Merge branch 'master' into docs-fixPaul Kehrer2015-09-044-45/+47
| | |\ \ | | |/ / | |/| |
| | * | fix a docs typo and convert it to a doctest to prevent future problemsPaul Kehrer2015-09-041-22/+24
| | | * Merge branch 'master' into static-linking-osxPaul Kehrer2015-09-048-52/+95
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #2320 from etrauschke/crl_vector_fixesPaul Kehrer2015-09-031-34/+33
| |\ \ \
| | * | | remove critical flag from cert issuer entry ext to work with OpenSSL < 1.0.0Erik Trauschke2015-09-031-34/+33
| |/ / /
| * | | Merge pull request #2319 from alex/x509-tutorial-docs-bugPaul Kehrer2015-09-031-6/+9
| |\ \ \
| | * | | Fixed #2318 -- added the missing critical flag to the x509 tutorialAlex Gaynor2015-09-031-6/+9
| |/ / /
| * | | Merge pull request #2316 from pyca/pypy-2.6.1Paul Kehrer2015-09-012-5/+5
| |\ \ \ | | |/ / | |/| |
| | * | fixAlex Gaynor2015-09-011-1/+1
| | * | upgrade to pypy 2.6.1Alex Gaynor2015-09-011-4/+4
| |/ /
| * | Merge pull request #2304 from Ayrx/fernet-docs-kdfPaul Kehrer2015-08-302-0/+42
| |\ \
| | * | Add bcrypt to word list.Terry Chia2015-08-301-0/+1
| | * | Mention bcrypt and scrypt.Terry Chia2015-08-301-1/+2
| | * | Fix imports and wordings.Terry Chia2015-08-291-5/+6
| | * | Add Django to wordlist.Terry Chia2015-08-291-0/+1
| | * | Fixed PBKDF2 class target.Terry Chia2015-08-291-1/+1
| | * | Fix link.Terry Chia2015-08-291-1/+1
| | * | Add some text regarding using passwords with Fernet.Terry Chia2015-08-291-0/+38
| * | | Merge pull request #2307 from reaperhulk/fix-test-orderingAlex Gaynor2015-08-292-7/+6
| |\ \ \
| | * | | Resolve an unusual test bug related to initializing the bindingsPaul Kehrer2015-08-292-7/+6
| |/ / /
| | | * rename env var to CRYPTOGRAPHY_OSX_NO_LINK_FLAGSPaul Kehrer2015-08-313-8/+8
| | | * no need for NonePaul Kehrer2015-08-291-1/+1
| | | * pypy doesn't name that shared object quite the samePaul Kehrer2015-08-291-1/+1
| | | * add some otool output to the OS X buildsPaul Kehrer2015-08-291-0/+4
| | | * move dynamic build and add an env to make it obvious it's dynamicPaul Kehrer2015-08-291-4/+4
| | | * update travis to static link homebrew openssl (plus one dynamic job)Paul Kehrer2015-08-292-6/+15
| | | * add support for static linking of the openssl backend on OS XPaul Kehrer2015-08-291-3/+16
| | |/ | |/|
| * | Merge pull request #2305 from alex/drop-nsa-linkPaul Kehrer2015-08-291-4/+4
| |\ \ | | |/ | |/|
| | * line lengthAlex Gaynor2015-08-291-4/+4
| | * spellingAlex Gaynor2015-08-291-1/+1
| | * Fixed #2270 -- update citation to something that worksAlex Gaynor2015-08-291-5/+5
| |/
| * Merge pull request #2303 from kjav/masterPaul Kehrer2015-08-281-0/+1
| |\
| | * Removed SSL_renegotiate_abbreviated bindingkjav2015-08-281-1/+0
| | * Added bindings for SSL_renegotiate_<pending/abbreviated>kjav2015-08-281-0/+2
| | * Merge pull request #1 from pyca/masterkjav2015-08-281-0/+1
| | |\ | | |/ | |/|
| * | Merge pull request #2302 from Ayrx/add-ssl-renegotiateAlex Gaynor2015-08-281-0/+1
| |\ \ | | |/ | |/|
| | * Add SSL_renegotiate binding.Terry Chia2015-08-281-0/+1
| |/
| * Merge pull request #2296 from reaperhulk/correct-my-review-mistakeAlex Gaynor2015-08-271-1/+5
| |\
| | * add conditional removal for SET_CERT_CBPaul Kehrer2015-08-251-1/+5
| * | Merge pull request #2297 from fxfitz/patch-1Alex Gaynor2015-08-271-1/+1
| |\ \
| | * | Update fernet.rst - removed a word!Fran Fitzpatrick2015-08-251-1/+1
| | |/
| * | Merge pull request #2298 from timbuchwaldt/patch-1Alex Gaynor2015-08-261-2/+2
| |\ \ | | |/ | |/|