Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #2345 from reaperhulk/pytest-workaround | Alex Gaynor | 2015-09-15 | 1 | -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 windows | Paul Kehrer | 2015-09-15 | 1 | -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 matrix | Paul Kehrer | 2015-09-15 | 3 | -1/+23 | |
|/ | ||||||
* | Merge pull request #2332 from reaperhulk/upgrade-osx-builders | Alex Gaynor | 2015-09-10 | 2 | -16/+14 | |
|\ | | | | | upgrade os x travis jobs to use latest image | |||||
| * | install/upgrade pyenv in os x builders | Paul Kehrer | 2015-09-10 | 1 | -4/+2 | |
| | | ||||||
| * | upgrade os x travis jobs to use latest image | Paul Kehrer | 2015-09-10 | 1 | -12/+12 | |
|/ | ||||||
* | Merge pull request #2334 from pyca/alex-patch-2 | Paul Kehrer | 2015-09-10 | 1 | -1/+2 | |
|\ | | | | | Don't use pipes | |||||
| * | Merge branch 'master' into alex-patch-2 | Alex Gaynor | 2015-09-09 | 1 | -1/+1 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #2333 from pyca/alex-patch-1 | Paul Kehrer | 2015-09-09 | 1 | -1/+1 | |
|\ \ | | | | | | | Don't use shell redirection | |||||
| * | | Don't use shell redirection | Alex Gaynor | 2015-09-09 | 1 | -1/+1 | |
|/ / | ||||||
| * | Don't use pipes | Alex Gaynor | 2015-09-09 | 1 | -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_oids | Paul Kehrer | 2015-09-08 | 2 | -1/+11 | |
|\ | | | | | Adds name property to ObjectIdentifier | |||||
| * | Merge branch 'master' into add_name_to_oids | Brendan McCollam | 2015-09-07 | 15 | -83/+216 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #2329 from reaperhulk/changelog-101 | Alex Gaynor | 2015-09-05 | 1 | -0/+12 | |
|\ \ | | | | | | | port 1.0.1 changelog to master | |||||
| * | | port 1.0.1 changelog to master | Paul Kehrer | 2015-09-05 | 1 | -0/+12 | |
|/ / | ||||||
* | | Merge pull request #2326 from reaperhulk/osx-static-linking-docs | Donald Stufft | 2015-09-05 | 1 | -14/+41 | |
|\ \ | | | | | | | rework OS X install docs to describe static/dynamic linking | |||||
| * | | rework OS X install docs to describe static/dynamic linking | Paul Kehrer | 2015-09-05 | 1 | -14/+41 | |
|/ / | ||||||
* | | Merge pull request #2306 from reaperhulk/static-linking-osx | Donald Stufft | 2015-09-05 | 3 | -9/+35 | |
|\ \ | | | | | | | Support static linking on OS X | |||||
| * \ | Merge branch 'master' into static-linking-osx | Paul Kehrer | 2015-09-05 | 1 | -22/+24 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #2322 from reaperhulk/docs-fix | Alex Gaynor | 2015-09-04 | 1 | -22/+24 | |
|\ \ \ | | | | | | | | | fix a docs typo and convert it to a doctest to prevent future problems | |||||
| * \ \ | Merge branch 'master' into docs-fix | Paul Kehrer | 2015-09-04 | 4 | -45/+47 | |
| |\ \ \ | |/ / / |/| | | | ||||||
| * | | | fix a docs typo and convert it to a doctest to prevent future problems | Paul Kehrer | 2015-09-04 | 1 | -22/+24 | |
| | | | | ||||||
| | * | | Merge branch 'master' into static-linking-osx | Paul Kehrer | 2015-09-04 | 8 | -52/+95 | |
| | |\ \ | |_|/ / |/| | | | ||||||
* | | | | Merge pull request #2320 from etrauschke/crl_vector_fixes | Paul Kehrer | 2015-09-03 | 1 | -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.0 | Erik Trauschke | 2015-09-03 | 1 | -34/+33 | |
|/ / / / | ||||||
* | | | | Merge pull request #2319 from alex/x509-tutorial-docs-bug | Paul Kehrer | 2015-09-03 | 1 | -6/+9 | |
|\ \ \ \ | | | | | | | | | | | Fixed #2318 -- added the missing critical flag to the x509 tutorial | |||||
| * | | | | Fixed #2318 -- added the missing critical flag to the x509 tutorial | Alex Gaynor | 2015-09-03 | 1 | -6/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #2316 from pyca/pypy-2.6.1 | Paul Kehrer | 2015-09-01 | 2 | -5/+5 | |
|\ \ \ \ | |/ / / |/| | | | upgrade to pypy 2.6.1 | |||||
| * | | | fix | Alex Gaynor | 2015-09-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | upgrade to pypy 2.6.1 | Alex Gaynor | 2015-09-01 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #2304 from Ayrx/fernet-docs-kdf | Paul Kehrer | 2015-08-30 | 2 | -0/+42 | |
|\ \ \ | | | | | | | | | Add some text regarding using passwords with Fernet. | |||||
| * | | | Add bcrypt to word list. | Terry Chia | 2015-08-30 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Mention bcrypt and scrypt. | Terry Chia | 2015-08-30 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Fix imports and wordings. | Terry Chia | 2015-08-29 | 1 | -5/+6 | |
| | | | | ||||||
| * | | | Add Django to wordlist. | Terry Chia | 2015-08-29 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Fixed PBKDF2 class target. | Terry Chia | 2015-08-29 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix link. | Terry Chia | 2015-08-29 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add some text regarding using passwords with Fernet. | Terry Chia | 2015-08-29 | 1 | -0/+38 | |
| | | | | ||||||
* | | | | Merge pull request #2307 from reaperhulk/fix-test-ordering | Alex Gaynor | 2015-08-29 | 2 | -7/+6 | |
|\ \ \ \ | | | | | | | | | | | Resolve an unusual test bug related to initializing the bindings | |||||
| * | | | | Resolve an unusual test bug related to initializing the bindings | Paul Kehrer | 2015-08-29 | 2 | -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_FLAGS | Paul Kehrer | 2015-08-31 | 3 | -8/+8 | |
| | | | | ||||||
| | * | | no need for None | Paul Kehrer | 2015-08-29 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | pypy doesn't name that shared object quite the same | Paul Kehrer | 2015-08-29 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | add some otool output to the OS X builds | Paul Kehrer | 2015-08-29 | 1 | -0/+4 | |
| | | | | ||||||
| | * | | move dynamic build and add an env to make it obvious it's dynamic | Paul Kehrer | 2015-08-29 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | update travis to static link homebrew openssl (plus one dynamic job) | Paul Kehrer | 2015-08-29 | 2 | -6/+15 | |
| | | | | ||||||
| | * | | add support for static linking of the openssl backend on OS X | Paul Kehrer | 2015-08-29 | 1 | -3/+16 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #2305 from alex/drop-nsa-link | Paul Kehrer | 2015-08-29 | 1 | -4/+4 | |
|\ \ \ | |/ / |/| | | Fixed #2270 -- update citation to something that works | |||||
| * | | line length | Alex Gaynor | 2015-08-29 | 1 | -4/+4 | |
| | | | ||||||
| * | | spelling | Alex Gaynor | 2015-08-29 | 1 | -1/+1 | |
| | | |