Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Explanatory comment | Alex Gaynor | 2014-01-01 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' into validate-iv | Alex Gaynor | 2014-01-01 | 64 | -729/+1528 |
|\ | | | | | | | | | | | Conflicts: tests/hazmat/backends/test_openssl.py tests/hazmat/primitives/test_block.py | ||||
| * | Merge pull request #383 from alex/bump-copyright | Paul Kehrer | 2014-01-01 | 2 | -2/+2 |
| |\ | | | | | | | Bump the copyright year | ||||
| | * | Bump the copyright year | Alex Gaynor | 2014-01-01 | 2 | -2/+2 |
| |/ | |||||
| * | Merge pull request #381 from public/compile-openssl-docs | Paul Kehrer | 2013-12-31 | 1 | -0/+27 |
| |\ | | | | | | | Document compiling OpenSSL to avoid conflicts | ||||
| | * | Document compiling OpenSSL to avoid conflicts | Alex Stapleton | 2013-12-31 | 1 | -0/+27 |
| |/ | |||||
| * | Merge pull request #376 from reaperhulk/more-engine-methods | Alex Gaynor | 2013-12-29 | 1 | -7/+101 |
| |\ | | | | | | | Add the rest of the engine methods | ||||
| | * | missed some param names (C style fix) | Paul Kehrer | 2013-12-29 | 1 | -2/+2 |
| | | | |||||
| | * | add the rest of the engine methods | Paul Kehrer | 2013-12-29 | 1 | -7/+101 |
| |/ | |||||
| * | Merge pull request #372 from exarkun/tlsv1.1-tlsv1.2 | Alex Gaynor | 2013-12-29 | 1 | -2/+57 |
| |\ | | | | | | | Optionally bind some TLSv1_1 and TLSv1_2 features | ||||
| | * | fix bogus merge | Jean-Paul Calderone | 2013-12-29 | 1 | -0/+1 |
| | | | |||||
| | * | Switch to long for these stand-in constants as suggested by reaperhulk to ↵ | Jean-Paul Calderone | 2013-12-29 | 1 | -2/+2 |
| | | | | | | | | | | | | avoid compiler warnings | ||||
| | * | merge origin/master | Jean-Paul Calderone | 2013-12-29 | 1 | -0/+12 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #373 from alex/restore-symbol | Paul Kehrer | 2013-12-29 | 1 | -0/+13 |
| |\ \ | | | | | | | | | Restore exposing a symbol when it's available. Refs #351 | ||||
| | * | | Restore exposing a symbol when it's available. Refs #351 | Alex Gaynor | 2013-12-29 | 1 | -0/+13 |
| |/ / | |||||
| | * | Optionally bind some TLSv1_1 and TLSv1_2 features | Jean-Paul Calderone | 2013-12-29 | 1 | -2/+57 |
| |/ | |||||
| * | Merge pull request #369 from public/signed-time_t | Paul Kehrer | 2013-12-28 | 1 | -1/+1 |
| |\ | | | | | | | time_t is signed | ||||
| | * | time_t is signed | Alex Stapleton | 2013-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | Unless you are on QNX, lulz. | ||||
| * | | Merge pull request #370 from alex/wider-types | Paul Kehrer | 2013-12-28 | 2 | -5/+5 |
| |\ \ | | | | | | | | | Make some types wider to be warning free on OS X | ||||
| | * | | Make some types wider to be warning free on OS X | Alex Gaynor | 2013-12-28 | 2 | -5/+5 |
| |/ / | |||||
| * | | Merge pull request #368 from reaperhulk/more-warnings-fixes | Alex Gaynor | 2013-12-28 | 3 | -4/+4 |
| |\ \ | | | | | | | | | Remove some consts in the function arg declarations | ||||
| | * | | remove some consts in the function arg declarations | Paul Kehrer | 2013-12-28 | 3 | -4/+4 |
| |/ / | | | | | | | | | | | | | | | | These functions take const in OpenSSL 1.0.0+ but not in 0.9.8. Removing the const declaration will silence warnings for 0.9.8 but not cause them in 1.0.0+. Not ideal, but *fingers crossed* shouldn't cause problems | ||||
| * | | Merge pull request #367 from alex/x509-revoked-stack | Paul Kehrer | 2013-12-28 | 1 | -6/+7 |
| |\ \ | | | | | | | | | Port the STACK_OF(X509_REVOKED) stuff to use the same pattern @exarkun figured out for X509 | ||||
| | * | | Port the STACK_OF(X509_REVOKED) stuff to use the same pattern @exarkun ↵ | Alex Gaynor | 2013-12-28 | 1 | -6/+7 |
| |/ / | | | | | | | | | | figured out for X509 | ||||
| * | | Merge pull request #364 from exarkun/certificates-and-stuff | Alex Gaynor | 2013-12-28 | 4 | -12/+35 |
| |\ \ | | | | | | | | | expose SSL_get_peer_cert_chain, SSL_get_client_CA_list, and SSL_CTX_set_client_CA_list | ||||
| | * | | clean up the comments a bit | Jean-Paul Calderone | 2013-12-28 | 3 | -8/+10 |
| | | | | |||||
| | * | | Switch other spellings of this type from `struct stack_st_X509` to ↵ | Jean-Paul Calderone | 2013-12-28 | 3 | -12/+12 |
| | | | | | | | | | | | | | | | | `Cryptography_STACK_OF_X590` (and similar for X509_NAME) | ||||
| | * | | move these type definitions to perhaps-more-appropriate modules | Jean-Paul Calderone | 2013-12-28 | 3 | -9/+6 |
| | | | | |||||
| | * | | This bit is important as well. | Jean-Paul Calderone | 2013-12-28 | 1 | -0/+1 |
| | | | | |||||
| | * | | Put back these other functions now that they ought to work. | Jean-Paul Calderone | 2013-12-28 | 1 | -3/+4 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into certificates-and-stuff | Jean-Paul Calderone | 2013-12-28 | 5 | -56/+80 |
| | |\ \ | |||||
| | * | | | typedef has to come before function prototype that relies on it; only place ↵ | Jean-Paul Calderone | 2013-12-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | that can happen is if the typedef is in INCLUDES woops | ||||
| | * | | | simplify a bit - just try tackling one problem at a time. and add some more ↵ | Jean-Paul Calderone | 2013-12-28 | 1 | -6/+16 |
| | | | | | | | | | | | | | | | | | | | | typedefs that maybe should help (still broken though) | ||||
| | * | | | expose SSL_get_peer_cert_chain, SSL_get_client_CA_list, and ↵ | Jean-Paul Calderone | 2013-12-28 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | SSL_CTX_set_client_CA_list | ||||
| * | | | | Merge pull request #365 from public/const-string-literal | Paul Kehrer | 2013-12-28 | 2 | -7/+7 |
| |\ \ \ \ | | | |_|/ | | |/| | | String literals are const char*. | ||||
| | * | | | String literals are const char*. | Alex Stapleton | 2013-12-28 | 2 | -7/+7 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | GCC won't whine with -Wall because so much code isn't const correct but writing to a string literal is undefined. -Wwrite-strings is the warning flag to enable to spot these. | ||||
| * | | | Merge pull request #366 from public/sk_X509_EXTENSION_delete-is-not-void | Alex Gaynor | 2013-12-28 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | sk_X509_EXTENSION_delete returns X509_EXTENSION* | ||||
| | * | | sk_X509_EXTENSION_delete returns X509_EXTENSION* | Alex Stapleton | 2013-12-28 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #361 from reaperhulk/define-to-int | Alex Gaynor | 2013-12-28 | 4 | -56/+76 |
| |\ \ | | | | | | | | | Convert #defines to explicit type declaration for consistency | ||||
| | * | | Fix docs | Paul Kehrer | 2013-12-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Convert #defines to explicit type declaration for consistency | Paul Kehrer | 2013-12-27 | 4 | -56/+76 |
| | |/ | |||||
| * | | Merge pull request #362 from exarkun/ssleay-version | Paul Kehrer | 2013-12-28 | 1 | -0/+3 |
| |\ \ | | | | | | | | | expose SSLeay and SSLeay_version | ||||
| | * | | expose SSLeay and SSLeay_version | Jean-Paul Calderone | 2013-12-28 | 1 | -0/+3 |
| | |/ | |||||
| * | | Merge pull request #363 from exarkun/sni-getservername | Paul Kehrer | 2013-12-28 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | add the missing SSL_get_servername prototype | ||||
| | * | add the missing SSL_get_servername prototype (already handled in the ↵ | Jean-Paul Calderone | 2013-12-28 | 1 | -0/+1 |
| |/ | | | | | | | existing SNI conditional section) | ||||
| * | Merge pull request #360 from reaperhulk/c-style-part-deux | Alex Gaynor | 2013-12-27 | 2 | -4/+4 |
| |\ | | | | | | | A few missed functions in the () -> (void) migration | ||||
| | * | a few missed functions in the () -> (void) migration | Paul Kehrer | 2013-12-27 | 2 | -4/+4 |
| | | | |||||
| * | | Merge pull request #357 from public/const-ASN1_ITEM_ptr | Jean-Paul Calderone | 2013-12-27 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | ASN1_ITEM_ptr always has a const return type | ||||
| | * | ASN1_ITEM_ptr always has a const return type | Alex Stapleton | 2013-12-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #358 from reaperhulk/c-style-change | Alex Gaynor | 2013-12-27 | 14 | -66/+65 |
| |\ \ | | | | | | | | | [WIP] C Style Change () -> (void) |