Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #748 from reaperhulk/098e-compat | Alex Gaynor | 2014-03-07 | 1 | -1/+20 |
|\ | | | | | 0.9.8e Compatibility (CentOS/RHEL 5) | ||||
| * | don't need to move these definitions | Paul Kehrer | 2014-03-07 | 1 | -6/+4 |
| | | |||||
| * | conditional NIDs for 0.9.8e | Paul Kehrer | 2014-03-07 | 1 | -5/+26 |
|/ | |||||
* | Merge pull request #758 from reaperhulk/x509-098e | Alex Gaynor | 2014-03-07 | 1 | -2/+9 |
|\ | | | | | x509 changes for 0.9.8e support | ||||
| * | x509 changes for 0.9.8e support | Paul Kehrer | 2014-03-07 | 1 | -2/+9 |
| | | |||||
* | | Merge pull request #757 from reaperhulk/ssl-098e-changes | Alex Gaynor | 2014-03-07 | 1 | -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 headers | Paul Kehrer | 2014-03-07 | 1 | -4/+36 |
| |/ | |||||
* | | Merge pull request #755 from reaperhulk/conditional-error-bindings | Alex Gaynor | 2014-03-07 | 1 | -7/+34 |
|\ \ | | | | | | | Bind some error constants conditionally for 0.9.8e support | ||||
| * | | bind some error constants conditionally for 0.9.8e support | Paul Kehrer | 2014-03-07 | 1 | -7/+34 |
| |/ | |||||
* | | Merge pull request #753 from reaperhulk/move-nids | David Reid | 2014-03-07 | 2 | -144/+142 |
|\ \ | | | | | | | Move some NIDs | ||||
| * | | move some nids | Paul Kehrer | 2014-03-07 | 2 | -144/+142 |
| |/ | |||||
* | | Merge pull request #754 from reaperhulk/bio-macro | Alex Gaynor | 2014-03-07 | 1 | -1/+4 |
|\ \ | | | | | | | BIO macro switch for 0.9.8e support | ||||
| * | | BIO macro switch for 0.9.8e support | Paul Kehrer | 2014-03-07 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #756 from reaperhulk/evp-macros | Alex Gaynor | 2014-03-07 | 1 | -5/+8 |
|\ \ | | | | | | | Macro switches in evp for 0.9.8e | ||||
| * | | macro switches in evp for 0.9.8e | Paul Kehrer | 2014-03-07 | 1 | -5/+8 |
| |/ | |||||
* | | Merge pull request #752 from reaperhulk/aes-wrap-conditional | Alex Gaynor | 2014-03-07 | 1 | -4/+24 |
|\ \ | |/ |/| | conditionally bind AES_wrap/unwrap for 0.9.8e support | ||||
| * | conditionally bind AES_wrap/unwrap for 0.9.8e support | Paul Kehrer | 2014-03-07 | 1 | -4/+24 |
|/ | |||||
* | Merge pull request #751 from lvh/master | Alex Gaynor | 2014-03-07 | 1 | -1/+1 |
|\ | | | | | Add GPG key fingerprint for lvh | ||||
| * | Add GPG key fingerprint for lvh | Laurens Van Houtven | 2014-03-07 | 1 | -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-098e | Alex Gaynor | 2014-03-07 | 1 | -0/+9 |
|\ \ | | | | | | | 0.9.8e EVP Workaround | ||||
| * | | change comparison to be easier to read | Paul Kehrer | 2014-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | ridiculous workaround time | Paul Kehrer | 2014-03-07 | 1 | -0/+9 |
| | | | |||||
* | | | Merge pull request #747 from alex/exception-heirarchy-refactor | Paul Kehrer | 2014-03-06 | 17 | -68/+89 |
|\ \ \ | | | | | | | | | Try to use more specific exceptions in places. | ||||
| * | | | whoops | Alex Gaynor | 2014-03-06 | 1 | -2/+0 |
| | | | | |||||
| * | | | Missing imports | Alex Gaynor | 2014-03-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Convert stuff | Alex Gaynor | 2014-03-06 | 15 | -52/+67 |
| | | | | |||||
| * | | | Merge branch 'master' into exception-heirarchy-refactor | Alex Gaynor | 2014-03-06 | 76 | -164/+44179 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/backends/openssl/backend.py | ||||
| * | | | Sigh. | Alex Gaynor | 2014-03-01 | 1 | -13/+4 |
| | | | | |||||
| * | | | Initial work | Alex Gaynor | 2014-02-26 | 3 | -17/+34 |
| | | | | |||||
* | | | | Merge pull request #746 from skeuomorf/dsa-binding | Alex Gaynor | 2014-03-06 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | Add binding for DSA_new | ||||
| * | | | Add binding for DSA_new | Mohammed Attia | 2014-03-06 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #741 from alex/consistency | Hynek Schlawack | 2014-03-06 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Be consistent with how we do this elsewhere | ||||
| * | | Be consistent with how we do this elsewhereh | Alex Gaynor | 2014-03-06 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #738 from alex/non-opaque-curve | David Reid | 2014-03-05 | 1 | -10/+8 |
|\ \ | | | | | | | Try to make this not-opaque. Might not work on CentOS | ||||
| * | | Simplify | Alex Gaynor | 2014-03-05 | 1 | -10/+6 |
| | | | |||||
| * | | Try to make this not-opaque. Might not work on CentOS | Alex Gaynor | 2014-03-05 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #736 from skeuomorf/bitlength | Alex Gaynor | 2014-03-05 | 2 | -11/+11 |
|\ \ | | | | | | | Move bit_length function from rsa to utils | ||||
| * | | Use the bit_length function from utils in RSA | Mohammed Attia | 2014-03-05 | 1 | -11/+2 |
| | | | |||||
| * | | Add bit_length function to utils | Mohammed Attia | 2014-03-05 | 1 | -0/+9 |
|/ / | |||||
* | | Merge pull request #733 from alex/more-ec-names | Donald Stufft | 2014-03-05 | 1 | -0/+15 |
|\ \ | | | | | | | Expose EC_get_builtin_curves | ||||
| * | | Ugh, C | Alex Gaynor | 2014-03-04 | 1 | -4/+4 |
| | | | |||||
| * | | Fix for systems without EC | Alex Gaynor | 2014-03-04 | 1 | -4/+11 |
| | | | |||||
| * | | Expose the fields | Alex Gaynor | 2014-03-04 | 1 | -1/+4 |
| | | | |||||
| * | | pff | Alex Gaynor | 2014-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Expose EC_get_builtin_curves | Alex Gaynor | 2014-03-04 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #729 from alex/install-pep8-naming | Donald Stufft | 2014-03-05 | 2 | -5/+9 |
|\ \ \ | | | | | | | | | Install pep8-naming on travis | ||||
| * | | | The worst. | Alex Gaynor | 2014-03-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Follow the rules | Alex Gaynor | 2014-03-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Install pep8-naming on travis | Alex Gaynor | 2014-03-04 | 1 | -2/+6 |
| |/ / | |||||
* | | | Merge pull request #734 from reaperhulk/more-ec-why-not | Alex Gaynor | 2014-03-04 | 1 | -0/+136 |
|\ \ \ | | | | | | | | | Add a bunch of EC NID/SN bindings for #732 |