aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1052 from alex/new-pypa-locationDonald Stufft2014-05-171-3/+3
|\ | | | | Use the new official URL for downloading get-pip.py
| * Use the new official URL for downloading get-pip.pyAlex Gaynor2014-05-171-3/+3
| |
* | Merge pull request #1051 from alex/bytes-is-bytesDonald Stufft2014-05-178-27/+16
|\ \ | |/ |/| We don't need six.binary_type, it's always bytes
| * We don't need six.binary_type, it's always bytesAlex Gaynor2014-05-178-27/+16
|/
* Merge pull request #1048 from Ayrx/change-unicode-checkAlex Stapleton2014-05-1715-52/+60
|\ | | | | Fixed TypeError and added documentation
| * Simplified exception messageAyrx2014-05-1715-105/+34
| |
| * Fixed TypeError and added documentationAyrx2014-05-1715-38/+117
|/
* Merge pull request #1047 from reaperhulk/remove-cms-macroAlex Gaynor2014-05-161-3/+0
|\ | | | | remove the macro we just added
| * remove the macro we just addedPaul Kehrer2014-05-161-3/+0
|/
* Merge pull request #1046 from reaperhulk/add-cms-macroAlex Gaynor2014-05-161-0/+3
|\ | | | | add a CMS macro
| * add a CMS macroPaul Kehrer2014-05-161-0/+3
| |
* | Merge pull request #1030 from alex/pypy-2.3Paul Kehrer2014-05-161-2/+2
|\ \ | | | | | | Use PyPy 2.3 on OS X
| * | ugh. good system.Alex Gaynor2014-05-161-2/+2
| | |
| * | Merge branch 'master' into pypy-2.3Alex Gaynor2014-05-1612-62/+337
| |\|
| * | Use PyPy 2.3 on OS XAlex Gaynor2014-05-091-2/+2
| | |
* | | Merge pull request #1044 from alex/reduce-duplicationPaul Kehrer2014-05-161-20/+11
|\ \ \ | | | | | | | | Reduce duplication. Also improve error message
| * | | FixAlex Gaynor2014-05-161-1/+5
| | | |
| * | | Reduce duplication. Also improve error messageAlex Gaynor2014-05-161-25/+12
| | | |
* | | | Merge pull request #1045 from reaperhulk/fix-coverage-i-are-dumbAlex Gaynor2014-05-161-0/+8
|\ \ \ \ | |/ / / |/| | | fix coverage for CFB8
| * | | fix coverage for CFB8Paul Kehrer2014-05-161-0/+8
| | |/ | |/|
* | | Merge pull request #1043 from reaperhulk/support-some-cfb8Alex Stapleton2014-05-167-9/+116
|\ \ \ | |/ / |/| | add CFB8 support for AES/3DES on CommonCrypto and OpenSSL backends
| * | sometimes you can't read and leave things inPaul Kehrer2014-05-161-2/+1
| | |
| * | native_size is not needed with the CFB8 approach we chosePaul Kehrer2014-05-161-2/+1
| | |
| * | add some docs and changelogPaul Kehrer2014-05-152-0/+17
| | |
| * | add CFB8 support for AES/3DES on CommonCrypto and OpenSSL backendsPaul Kehrer2014-05-155-10/+102
|/ /
* | 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
* | Merge pull request #1025 from reaperhulk/add-faq-windowsAlex Gaynor2014-05-081-0/+13
|\ \ | | | | | | Add FAQ entry to docs for windows OpenSSL issues