aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Explanatory commentAlex Gaynor2014-01-011-1/+3
|
* Merge branch 'master' into validate-ivAlex Gaynor2014-01-0164-729/+1528
|\ | | | | | | | | | | Conflicts: tests/hazmat/backends/test_openssl.py tests/hazmat/primitives/test_block.py
| * Merge pull request #383 from alex/bump-copyrightPaul Kehrer2014-01-012-2/+2
| |\ | | | | | | Bump the copyright year
| | * Bump the copyright yearAlex Gaynor2014-01-012-2/+2
| |/
| * Merge pull request #381 from public/compile-openssl-docsPaul Kehrer2013-12-311-0/+27
| |\ | | | | | | Document compiling OpenSSL to avoid conflicts
| | * Document compiling OpenSSL to avoid conflictsAlex Stapleton2013-12-311-0/+27
| |/
| * Merge pull request #376 from reaperhulk/more-engine-methodsAlex Gaynor2013-12-291-7/+101
| |\ | | | | | | Add the rest of the engine methods
| | * missed some param names (C style fix)Paul Kehrer2013-12-291-2/+2
| | |
| | * add the rest of the engine methodsPaul Kehrer2013-12-291-7/+101
| |/
| * Merge pull request #372 from exarkun/tlsv1.1-tlsv1.2Alex Gaynor2013-12-291-2/+57
| |\ | | | | | | Optionally bind some TLSv1_1 and TLSv1_2 features
| | * fix bogus mergeJean-Paul Calderone2013-12-291-0/+1
| | |
| | * Switch to long for these stand-in constants as suggested by reaperhulk to ↵Jean-Paul Calderone2013-12-291-2/+2
| | | | | | | | | | | | avoid compiler warnings
| | * merge origin/masterJean-Paul Calderone2013-12-291-0/+12
| | |\ | | |/ | |/|
| * | Merge pull request #373 from alex/restore-symbolPaul Kehrer2013-12-291-0/+13
| |\ \ | | | | | | | | Restore exposing a symbol when it's available. Refs #351
| | * | Restore exposing a symbol when it's available. Refs #351Alex Gaynor2013-12-291-0/+13
| |/ /
| | * Optionally bind some TLSv1_1 and TLSv1_2 featuresJean-Paul Calderone2013-12-291-2/+57
| |/
| * Merge pull request #369 from public/signed-time_tPaul Kehrer2013-12-281-1/+1
| |\ | | | | | | time_t is signed
| | * time_t is signedAlex Stapleton2013-12-291-1/+1
| | | | | | | | | | | | Unless you are on QNX, lulz.
| * | Merge pull request #370 from alex/wider-typesPaul Kehrer2013-12-282-5/+5
| |\ \ | | | | | | | | Make some types wider to be warning free on OS X
| | * | Make some types wider to be warning free on OS XAlex Gaynor2013-12-282-5/+5
| |/ /
| * | Merge pull request #368 from reaperhulk/more-warnings-fixesAlex Gaynor2013-12-283-4/+4
| |\ \ | | | | | | | | Remove some consts in the function arg declarations
| | * | remove some consts in the function arg declarationsPaul Kehrer2013-12-283-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-stackPaul Kehrer2013-12-281-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 Gaynor2013-12-281-6/+7
| |/ / | | | | | | | | | figured out for X509
| * | Merge pull request #364 from exarkun/certificates-and-stuffAlex Gaynor2013-12-284-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 bitJean-Paul Calderone2013-12-283-8/+10
| | | |
| | * | Switch other spellings of this type from `struct stack_st_X509` to ↵Jean-Paul Calderone2013-12-283-12/+12
| | | | | | | | | | | | | | | | `Cryptography_STACK_OF_X590` (and similar for X509_NAME)
| | * | move these type definitions to perhaps-more-appropriate modulesJean-Paul Calderone2013-12-283-9/+6
| | | |
| | * | This bit is important as well.Jean-Paul Calderone2013-12-281-0/+1
| | | |
| | * | Put back these other functions now that they ought to work.Jean-Paul Calderone2013-12-281-3/+4
| | | |
| | * | Merge remote-tracking branch 'origin/master' into certificates-and-stuffJean-Paul Calderone2013-12-285-56/+80
| | |\ \
| | * | | typedef has to come before function prototype that relies on it; only place ↵Jean-Paul Calderone2013-12-281-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 Calderone2013-12-281-6/+16
| | | | | | | | | | | | | | | | | | | | typedefs that maybe should help (still broken though)
| | * | | expose SSL_get_peer_cert_chain, SSL_get_client_CA_list, and ↵Jean-Paul Calderone2013-12-281-0/+12
| | | | | | | | | | | | | | | | | | | | SSL_CTX_set_client_CA_list
| * | | | Merge pull request #365 from public/const-string-literalPaul Kehrer2013-12-282-7/+7
| |\ \ \ \ | | | |_|/ | | |/| | String literals are const char*.
| | * | | String literals are const char*.Alex Stapleton2013-12-282-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-voidAlex Gaynor2013-12-281-1/+1
| |\ \ \ | | |/ / | |/| | sk_X509_EXTENSION_delete returns X509_EXTENSION*
| | * | sk_X509_EXTENSION_delete returns X509_EXTENSION*Alex Stapleton2013-12-281-1/+1
| |/ /
| * | Merge pull request #361 from reaperhulk/define-to-intAlex Gaynor2013-12-284-56/+76
| |\ \ | | | | | | | | Convert #defines to explicit type declaration for consistency
| | * | Fix docsPaul Kehrer2013-12-271-1/+1
| | | |
| | * | Convert #defines to explicit type declaration for consistencyPaul Kehrer2013-12-274-56/+76
| | |/
| * | Merge pull request #362 from exarkun/ssleay-versionPaul Kehrer2013-12-281-0/+3
| |\ \ | | | | | | | | expose SSLeay and SSLeay_version
| | * | expose SSLeay and SSLeay_versionJean-Paul Calderone2013-12-281-0/+3
| | |/
| * | Merge pull request #363 from exarkun/sni-getservernamePaul Kehrer2013-12-281-0/+1
| |\ \ | | |/ | |/| add the missing SSL_get_servername prototype
| | * add the missing SSL_get_servername prototype (already handled in the ↵Jean-Paul Calderone2013-12-281-0/+1
| |/ | | | | | | existing SNI conditional section)
| * Merge pull request #360 from reaperhulk/c-style-part-deuxAlex Gaynor2013-12-272-4/+4
| |\ | | | | | | A few missed functions in the () -> (void) migration
| | * a few missed functions in the () -> (void) migrationPaul Kehrer2013-12-272-4/+4
| | |
| * | Merge pull request #357 from public/const-ASN1_ITEM_ptrJean-Paul Calderone2013-12-271-1/+1
| |\ \ | | |/ | |/| ASN1_ITEM_ptr always has a const return type
| | * ASN1_ITEM_ptr always has a const return typeAlex Stapleton2013-12-271-1/+1
| | |
| * | Merge pull request #358 from reaperhulk/c-style-changeAlex Gaynor2013-12-2714-66/+65
| |\ \ | | | | | | | | [WIP] C Style Change () -> (void)