aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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
| | |
| * | 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
|\ \ | | | | | | Added bindings for SSL_renegotiate_pending
| * | Removed SSL_renegotiate_abbreviated bindingkjav2015-08-281-1/+0
| | | | | | | | | As this is not supported in OpenSSL < 1.01
| * | Added bindings for SSL_renegotiate_<pending/abbreviated>kjav2015-08-281-0/+2
| | |
| * | Merge pull request #1 from pyca/masterkjav2015-08-281-0/+1
| |\ \ | |/ / |/| | Adds SSL_renegotiate binding
* | | Merge pull request #2302 from Ayrx/add-ssl-renegotiateAlex Gaynor2015-08-281-0/+1
|\ \ \ | |/ / |/| | Add SSL_renegotiate binding.
| * | 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_CB
| * | 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!
| * | | 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
|\ \ \ | |/ / |/| | Documentation: Write as key/CSR binary
| * | Write as binaryTim Buchwaldt2015-08-261-2/+2
|/ / | | | | At least on Python3 it fails otherwise.
* | Merge pull request #2295 from mhils/set_cert_cbPaul Kehrer2015-08-251-0/+17
|\ \ | | | | | | Add set_cert_cb
| * | add set_cert_cbMaximilian Hils2015-08-251-0/+17
|/ /
| * Adds _name property to ObjectIdentifierBrendan McCollam2015-09-062-1/+11
|/
* Merge pull request #2292 from reaperhulk/default-stringmaskAlex Gaynor2015-08-221-0/+6
|\ | | | | set the default stringmask to utf8
| * set the default stringmask to utf8Paul Kehrer2015-08-221-0/+6
|/ | | | | This corrects a problem where older OpenSSL versions don't do this by default. fixes #2291
* Merge pull request #2285 from reaperhulk/pypy-errorAlex Gaynor2015-08-201-1/+7
|\ | | | | raise an error if trying to install on PyPy < 2.6
| * raise an error if trying to install on PyPy < 2.6Paul Kehrer2015-08-201-1/+7
|/
* Merge pull request #2282 from reaperhulk/ssl-bindingsAlex Gaynor2015-08-191-0/+8
|\ | | | | additional SSL bindings
| * libre doesn't have these fields (and might only be used in sslv2 anyway)Paul Kehrer2015-08-191-2/+0
| |