aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #748 from reaperhulk/098e-compatAlex Gaynor2014-03-071-1/+20
|\ | | | | 0.9.8e Compatibility (CentOS/RHEL 5)
| * don't need to move these definitionsPaul Kehrer2014-03-071-6/+4
| |
| * conditional NIDs for 0.9.8ePaul Kehrer2014-03-071-5/+26
|/
* Merge pull request #758 from reaperhulk/x509-098eAlex Gaynor2014-03-071-2/+9
|\ | | | | x509 changes for 0.9.8e support
| * x509 changes for 0.9.8e supportPaul Kehrer2014-03-071-2/+9
| |
* | Merge pull request #757 from reaperhulk/ssl-098e-changesAlex Gaynor2014-03-071-4/+36
|\ \ | | | | | | more changes for 0.9.8e support, this time in the ssl.h headers
| * | more changes for 0.9.8e support, this time in the ssl.h headersPaul Kehrer2014-03-071-4/+36
| |/
* | Merge pull request #755 from reaperhulk/conditional-error-bindingsAlex Gaynor2014-03-071-7/+34
|\ \ | | | | | | Bind some error constants conditionally for 0.9.8e support
| * | bind some error constants conditionally for 0.9.8e supportPaul Kehrer2014-03-071-7/+34
| |/
* | Merge pull request #753 from reaperhulk/move-nidsDavid Reid2014-03-072-144/+142
|\ \ | | | | | | Move some NIDs
| * | move some nidsPaul Kehrer2014-03-072-144/+142
| |/
* | Merge pull request #754 from reaperhulk/bio-macroAlex Gaynor2014-03-071-1/+4
|\ \ | | | | | | BIO macro switch for 0.9.8e support
| * | BIO macro switch for 0.9.8e supportPaul Kehrer2014-03-071-1/+4
| |/
* | Merge pull request #756 from reaperhulk/evp-macrosAlex Gaynor2014-03-071-5/+8
|\ \ | | | | | | Macro switches in evp for 0.9.8e
| * | macro switches in evp for 0.9.8ePaul Kehrer2014-03-071-5/+8
| |/
* | Merge pull request #752 from reaperhulk/aes-wrap-conditionalAlex Gaynor2014-03-071-4/+24
|\ \ | |/ |/| conditionally bind AES_wrap/unwrap for 0.9.8e support
| * conditionally bind AES_wrap/unwrap for 0.9.8e supportPaul Kehrer2014-03-071-4/+24
|/
* Merge pull request #751 from lvh/masterAlex Gaynor2014-03-071-1/+1
|\ | | | | Add GPG key fingerprint for lvh
| * Add GPG key fingerprint for lvhLaurens Van Houtven2014-03-071-1/+1
| | | | | | | | | | I have a new key, see revocation: https://gist.github.com/lvh/9412036 New key is forward-signed with old one.
* | Merge pull request #750 from reaperhulk/update-098eAlex Gaynor2014-03-071-0/+9
|\ \ | | | | | | 0.9.8e EVP Workaround
| * | change comparison to be easier to readPaul Kehrer2014-03-071-1/+1
| | |
| * | ridiculous workaround timePaul Kehrer2014-03-071-0/+9
| | |
* | | Merge pull request #747 from alex/exception-heirarchy-refactorPaul Kehrer2014-03-0617-68/+89
|\ \ \ | | | | | | | | Try to use more specific exceptions in places.
| * | | whoopsAlex Gaynor2014-03-061-2/+0
| | | |
| * | | Missing importsAlex Gaynor2014-03-061-2/+2
| | | |
| * | | Convert stuffAlex Gaynor2014-03-0615-52/+67
| | | |
| * | | Merge branch 'master' into exception-heirarchy-refactorAlex Gaynor2014-03-0676-164/+44179
| |\| | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/backends/openssl/backend.py
| * | | Sigh.Alex Gaynor2014-03-011-13/+4
| | | |
| * | | Initial workAlex Gaynor2014-02-263-17/+34
| | | |
* | | | Merge pull request #746 from skeuomorf/dsa-bindingAlex Gaynor2014-03-061-0/+1
|\ \ \ \ | |_|/ / |/| | | Add binding for DSA_new
| * | | Add binding for DSA_newMohammed Attia2014-03-061-0/+1
|/ / /
* | | Merge pull request #741 from alex/consistencyHynek Schlawack2014-03-061-1/+1
|\ \ \ | |_|/ |/| | Be consistent with how we do this elsewhere
| * | Be consistent with how we do this elsewherehAlex Gaynor2014-03-061-1/+1
|/ /
* | Merge pull request #738 from alex/non-opaque-curveDavid Reid2014-03-051-10/+8
|\ \ | | | | | | Try to make this not-opaque. Might not work on CentOS
| * | SimplifyAlex Gaynor2014-03-051-10/+6
| | |
| * | Try to make this not-opaque. Might not work on CentOSAlex Gaynor2014-03-051-1/+3
|/ /
* | Merge pull request #736 from skeuomorf/bitlengthAlex Gaynor2014-03-052-11/+11
|\ \ | | | | | | Move bit_length function from rsa to utils
| * | Use the bit_length function from utils in RSAMohammed Attia2014-03-051-11/+2
| | |
| * | Add bit_length function to utilsMohammed Attia2014-03-051-0/+9
|/ /
* | Merge pull request #733 from alex/more-ec-namesDonald Stufft2014-03-051-0/+15
|\ \ | | | | | | Expose EC_get_builtin_curves
| * | Ugh, CAlex Gaynor2014-03-041-4/+4
| | |
| * | Fix for systems without ECAlex Gaynor2014-03-041-4/+11
| | |
| * | Expose the fieldsAlex Gaynor2014-03-041-1/+4
| | |
| * | pffAlex Gaynor2014-03-041-1/+1
| | |
| * | Expose EC_get_builtin_curvesAlex Gaynor2014-03-041-0/+5
| | |
* | | Merge pull request #729 from alex/install-pep8-namingDonald Stufft2014-03-052-5/+9
|\ \ \ | | | | | | | | Install pep8-naming on travis
| * | | The worst.Alex Gaynor2014-03-041-1/+1
| | | |
| * | | Follow the rulesAlex Gaynor2014-03-041-2/+2
| | | |
| * | | Install pep8-naming on travisAlex Gaynor2014-03-041-2/+6
| |/ /
* | | Merge pull request #734 from reaperhulk/more-ec-why-notAlex Gaynor2014-03-041-0/+136
|\ \ \ | | | | | | | | Add a bunch of EC NID/SN bindings for #732