aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #2345 from reaperhulk/pytest-workaroundAlex Gaynor2015-09-151-1/+1
|\ \ | | | | | | workaround for pytest 2.7.3's expectation of USERNAME on windows
| * | workaround for pytest 2.7.3's expectation of USERNAME on windowsPaul Kehrer2015-09-151-1/+1
|/ / | | | | | | | | We should remove this when a pytest that resolves https://github.com/pytest-dev/pytest/issues/1010 is released
| * let's add python 3.5 to our test matrixPaul Kehrer2015-09-153-1/+23
|/
* Merge pull request #2332 from reaperhulk/upgrade-osx-buildersAlex Gaynor2015-09-102-16/+14
|\ | | | | upgrade os x travis jobs to use latest image
| * install/upgrade pyenv in os x buildersPaul Kehrer2015-09-101-4/+2
| |
| * upgrade os x travis jobs to use latest imagePaul Kehrer2015-09-101-12/+12
|/
* Merge pull request #2334 from pyca/alex-patch-2Paul Kehrer2015-09-101-1/+2
|\ | | | | Don't use pipes
| * Merge branch 'master' into alex-patch-2Alex Gaynor2015-09-091-1/+1
| |\ | |/ |/|
* | Merge pull request #2333 from pyca/alex-patch-1Paul Kehrer2015-09-091-1/+1
|\ \ | | | | | | Don't use shell redirection
| * | Don't use shell redirectionAlex Gaynor2015-09-091-1/+1
|/ /
| * Don't use pipesAlex Gaynor2015-09-091-1/+2
|/ | | Download the whole file first, @glyph points out that truncation attacks are a thing.
* Merge pull request #2294 from bjmc/add_name_to_oidsPaul Kehrer2015-09-082-1/+11
|\ | | | | Adds name property to ObjectIdentifier
| * 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 master
| * | 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 linking
| * | 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
|\ \ | | | | | | Support static linking on OS X
| * \ 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
|\ \ \ | | | | | | | | fix a docs typo and convert it to a doctest to prevent future problems
| * \ \ 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 …
| * | | | 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 tutorial
| * | | | 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
|\ \ \ \ | |/ / / |/| | | upgrade to pypy 2.6.1
| * | | 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 some text regarding using passwords with Fernet.
| * | | 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 bindings
| * | | | Resolve an unusual test bug related to initializing the bindingsPaul Kehrer2015-08-292-7/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make calls against the "SSL" parts of OpenSSL you need to call SSL_library_init. There are multiple ways this can be called: * If you're using the same OpenSSL in cryptography as you are in your Python then Python will call it for you. * If you import the openssl backend. These tests need SSL_library_init to be called. When run in our CI SSL_library_init is called because during the parametrization step the OpenSSL backend is imported (thus triggering it). However, you can also run tests directly via py.test and without this change py.test tests/hazmat/bindings/test_openssl.py would crash if you had cryptography linked against a different OpenSSL than your Python used.
| | * | 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
|\ \ \ | |/ / |/| | Fixed #2270 -- update citation to something that works
| * | line lengthAlex Gaynor2015-08-291-4/+4
| | |
| * | spellingAlex Gaynor2015-08-291-1/+1
| | |