aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ugh. good system.Alex Gaynor2014-05-161-2/+2
|
* Merge branch 'master' into pypy-2.3Alex Gaynor2014-05-1612-62/+337
|\
| * Merge pull request #1042 from alex/improve-docsPaul Kehrer2014-05-151-2/+8
| |\ | | | | | | Fixed #1039 -- provide links to PSS and PKCS1v15 in the RSA docs
| | * Missing semicolonAlex Gaynor2014-05-151-4/+4
| | |
| | * Fixed #1039 -- provide links to PSS and PKCS1v15 in the RSA docsAlex Gaynor2014-05-151-2/+8
| |/
| * Merge pull request #1040 from alex/pointless-codePaul Kehrer2014-05-151-3/+1
| |\ | | | | | | Simplify some code that was needlessly complex
| | * Simplify some code that was needlessly complexAlex Gaynor2014-05-151-3/+1
| |/
| * Merge pull request #1037 from reaperhulk/update-changelogAlex Gaynor2014-05-131-0/+2
| |\ | | | | | | add HKDFExpand to changelog
| | * add HKDFExpand to changelogPaul Kehrer2014-05-121-0/+2
| |/
| * Merge pull request #1035 from phibos/get_comp_nameAlex Gaynor2014-05-111-0/+5
| |\ | | | | | | Function to get current compression and expansion
| | * Function to get current compression and expansionPhiBo2014-05-111-0/+5
| |/
| * Merge pull request #1016 from Ayrx/hkdf-expand-onlyAlex Stapleton2014-05-104-22/+204
| |\ | | | | | | HKDF Expand Only implementation
| | * Added missing exception to documentationAyrx2014-05-101-0/+6
| | |
| | * Minor fixesAyrx2014-05-092-8/+2
| | |
| | * Modified HKDF to use HKDFExpandAyrx2014-05-073-37/+52
| | |
| | * Renamed HKDFExpandOnly to HKDFExpandAyrx2014-05-073-13/+13
| | |
| | * Added documentationAyrx2014-05-061-0/+86
| | |
| | * Fixed test failuresAyrx2014-05-062-4/+5
| | |
| | * Added tests for HKDFExpandOnlyAyrx2014-05-051-1/+59
| | |
| | * Added HKDFExpandOnlyAyrx2014-05-051-0/+22
| | |
| * | Merge pull request #1032 from reaperhulk/bold-docsAlex Gaynor2014-05-091-1/+1
| |\ \ | | | | | | | | Use bold instead of italics
| | * | Use bold instead of italicsPaul Kehrer2014-05-091-1/+1
| | | |
| * | | Merge pull request #1031 from reaperhulk/rsa-docs-fixAlex Gaynor2014-05-091-0/+14
| |\ \ \ | | | | | | | | | | Improve RSABackend interface docs (fixes #1022)
| | * | | Improve RSABackend interface docs (fixes #1022)Paul Kehrer2014-05-091-0/+14
| | |/ /
| * | | Merge pull request #1028 from reaperhulk/multibackend-rsabackendAlex Gaynor2014-05-093-34/+102
| |\ \ \ | | |/ / | |/| | Multibackend now supports all of RSABackend
| | * | Multibackend now supports all of RSABackendPaul Kehrer2014-05-093-34/+102
| |/ / | | | | | | | | | Also convert some examples to doctest
* / / Use PyPy 2.3 on OS XAlex Gaynor2014-05-091-2/+2
|/ /
* | Merge pull request #1025 from reaperhulk/add-faq-windowsAlex Gaynor2014-05-081-0/+13
|\ \ | | | | | | Add FAQ entry to docs for windows OpenSSL issues
| * | improved languagePaul Kehrer2014-05-081-1/+1
| | |
| * | add faq entry to describe the error if a windows user doesn't install opensslPaul Kehrer2014-05-081-0/+13
| | |
* | | Merge pull request #1021 from dreid/conda-linuxAlex Gaynor2014-05-071-2/+10
|\ \ \ | | | | | | | | Fix #1020 - Add conda instructions for linux.
| * | | Wrap.David Reid2014-05-071-1/+2
| | | |
| * | | Lowercase a.David Reid2014-05-071-1/+1
| | | |
| * | | Fix #1020 - Add conda instructions for linux.David Reid2014-05-071-2/+9
|/ / /
* | | Merge pull request #1019 from phibos/masterPaul Kehrer2014-05-061-1/+29
|\ \ \ | |/ / |/| | [OpenSSL bindings] get cipher list + secure renegotation status
| * | Add missing type SSL_OP_LEGACY_SERVER_CONNECTPhiBo2014-05-071-0/+1
| | |
| * | Fix to build without secure renegotiation supportPhiBo2014-05-071-5/+7
| | |
| * | Conditional binding for secure renegotiationPhiBo2014-05-061-6/+11
| | |
| * | style fixes and conditional binding for SSL_OP_ALLOW_UNSAFE_RENEGOTIATIONPaul Kehrer2014-05-061-4/+15
| | |
| * | Add macro to get secure renegotiation supportPhiBo2014-05-041-0/+2
| | |
| * | Add support for SSL_get_ciphers()PhiBo2014-05-041-0/+7
| | |
* | | Merge pull request #1017 from Ayrx/fix-documentation-typoPaul Kehrer2014-05-061-1/+1
|\ \ \ | |_|/ |/| | Fixed misspelling
| * | Fixed misspellingAyrx2014-05-061-1/+1
|/ /
* | Merge pull request #1014 from public/098kPaul Kehrer2014-05-041-0/+1
|\ \ | |/ |/| We also test on Ubuntu Lucid 0.9.8k
| * We also test on Ubuntu Lucid 0.9.8kAlex Stapleton2014-05-041-0/+1
| |
* | Merge pull request #1011 from Ayrx/add-release-itemAlex Stapleton2014-05-041-0/+3
|\ \ | | | | | | Added item to post-release tasks
| * | Added item to post-release tasksAyrx2014-05-041-0/+3
|/ /
* | Merge pull request #1010 from alex/deprecatedPaul Kehrer2014-05-032-20/+24
|\ \ | | | | | | Switch tests to pass salt length to the right place, except where actually testing the deprecation support
| * | Whoopsie daysie.Alex Gaynor2014-05-031-2/+2
| | | | | | | | | | | | That's a fun commit message. So lyrical.
| * | Always use deprecated_callAlex Gaynor2014-05-031-4/+8
| | |