aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change password callback to use userdata pointerChristian Heimes2015-12-202-35/+63
| | | | | | | | | Instead of a closure the pem_password_cb now uses the void *userdata argument to exchange data with the callback function. It's a necessary step to port all callbacks to new static callbacks. See: #2477 Signed-off-by: Christian Heimes <christian@python.org>
* Merge pull request #2535 from alex/encode-dssPaul Kehrer2015-12-192-5/+5
|\ | | | | use the non-deprecated name for this function
| * use the non-deprecated name for this functionAlex Gaynor2015-12-192-5/+5
| |
* | Merge pull request #2530 from nbastin/20151214-oid-valPaul Kehrer2015-12-183-36/+101
|\ \ | |/ |/| OID validation
| * TypoNick Bastin2015-12-171-1/+1
| |
| * Avoid IndexError on too-short OIDs, add test for regressionNick Bastin2015-12-172-0/+9
| |
| * OID validationNick Bastin2015-12-143-36/+92
| |
* | Merge pull request #2532 from reaperhulk/fix-memory-leakAlex Gaynor2015-12-151-2/+2
|\ \ | | | | | | X509_set_subject_name and X509_set_issuer_name copy the object
| * | X509_set_subject_name and X509_set_issuer_name copy the objectPaul Kehrer2015-12-151-2/+2
| | | | | | | | | | | | | | | So we need to register our own copy for gc. This fixes a memory leak reported by Wulf.
* | | Merge pull request #2529 from Lukasa/remove_sslv2_bindingsPaul Kehrer2015-12-142-22/+5
|\ \ \ | |/ / |/| | Remove SSLv2 bindings.
| * | Comment lingering SSLv2 symbol.Cory Benfield2015-12-141-0/+4
| | |
| * | Remove SSLv2 bindings.Cory Benfield2015-12-142-22/+1
|/ / | | | | | | | | | | | | | | | | This commit removes bindings that allow users to set SSLv2 handshake methods. These are regarded as unnecessary and out-of-date: see #2527. This commit does leave in a few options that refer to SSLv2 in order to avoid breaking deployments that rely on them, and in order to allow users to continue to request that SSLv2 not be enabled at all in their OpenSSL.
* | Merge pull request #2528 from reaperhulk/fix-2496Alex Gaynor2015-12-142-0/+33
|\ \ | |/ |/| require not_valid_after >= not_valid_before
| * require not_valid_after >= not_valid_beforePaul Kehrer2015-12-132-0/+33
|/
* Merge pull request #2522 from reaperhulk/unpin-pytestAlex Gaynor2015-12-123-3/+3
|\ | | | | Revert "pin pytest to disallow 2.8.4 which breaks tests"
| * Revert "pin pytest to disallow 2.8.4 which breaks tests"Paul Kehrer2015-12-113-3/+3
|/ | | | This reverts commit ed48066a3f8e58af58926a17906540213e57f88e.
* Merge pull request #2520 from reaperhulk/port-changelogAlex Gaynor2015-12-102-0/+10
|\ | | | | port 1.1.2 changelog to master
| * port 1.1.2 changelog to masterPaul Kehrer2015-12-102-0/+10
|/
* Merge pull request #2515 from reaperhulk/sigbusAlex Gaynor2015-12-092-22/+0
|\ | | | | remove the bindings for these x86_64 specific EC functions
| * remove the bindings for these x86_64 specific EC functionsPaul Kehrer2015-12-092-22/+0
| | | | | | | | | | | | | | | | We have no need to invoke them directly and their presence triggers a bug related to Fedora 23's hobbling of openssl EC functions (uugh) This also fixes the SIGBUS issue in #2503, although that is more appropriately resolved via header fixes for universal libraries on OS X.
* | Merge pull request #2512 from Lukasa/docs_certificate_builderAlex Gaynor2015-12-071-5/+1
|\ \ | | | | | | Have CertificateBuilder docs create self-signed cert
| * | Have CertificateBuilder docs create self-signed certCory Benfield2015-12-071-5/+1
| | |
* | | Merge pull request #2511 from alex/pypy-4.0.1Paul Kehrer2015-12-071-4/+4
|\ \ \ | | | | | | | | bump to pypy 4.0.1
| * \ \ Merge branch 'master' into pypy-4.0.1Alex Gaynor2015-12-0711-3/+279
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #2513 from alex/bin-pytestPaul Kehrer2015-12-073-3/+3
|\ \ \ \ | |_|/ / |/| | | pin pytest to disallow 2.8.4 which breaks tests
| * | | pin pytest to disallow 2.8.4 which breaks testsAlex Gaynor2015-12-073-3/+3
| | | |
* | | | Merge pull request #2507 from reaperhulk/tbs-csr-bytesAlex Gaynor2015-12-046-0/+189
|\ \ \ \ | | | | | | | | | | Support signature and tbs_certrequest_bytes on CertificateSigningRequest
| * | | | add some missing skipsPaul Kehrer2015-12-031-0/+2
| | | | |
| * | | | fix the comment so that it is no longer nonsensePaul Kehrer2015-12-031-1/+1
| | | | |
| * | | | changelog entryPaul Kehrer2015-12-031-0/+4
| | | | |
| * | | | expose tbs_certrequest_bytes and signature on CertificateSigningRequestPaul Kehrer2015-12-035-0/+183
|/ / / /
* | | | Merge pull request #2504 from reaperhulk/encode-name-constraintsAlex Gaynor2015-12-034-0/+87
|\ \ \ \ | |/ / / |/| | | implement support for encoding name constraints
| * | | this is also supported in the CSRBuilderPaul Kehrer2015-12-021-1/+2
| | | |
| * | | move _encode_name_constraints and _encode_general_subtreesPaul Kehrer2015-12-021-36/+36
| | | |
| * | | implement support for encoding name constraintsPaul Kehrer2015-12-024-0/+86
| | |/ | |/|
| | * bump to pypy 4.0.1Alex Gaynor2015-12-061-4/+4
| |/ |/|
* | Merge pull request #2501 from reaperhulk/fix-usernoticeAlex Gaynor2015-12-032-2/+14
|\ \ | |/ |/| fix a warning in cffi
| * shouldn't need values herePaul Kehrer2015-12-011-3/+3
| |
| * if EC isn't present we need to declare this enumPaul Kehrer2015-12-011-1/+5
| |
| * let the compiler figure out these valuesPaul Kehrer2015-12-011-3/+4
| |
| * fix a warning in cffiPaul Kehrer2015-12-012-1/+8
|/ | | | | cffi doesn't want to guess the type, so we'll deopaque the enum and strip the values out of the lib if EC is unavailable
* Merge pull request #2500 from reaperhulk/pin-sphinxAlex Gaynor2015-12-012-2/+2
|\ | | | | pin sphinx to 1.3.1 while we sort out the bytes repr issue with 1.3.2
| * pin sphinx to 1.3.1 while we sort out the bytes repr issue with 1.3.2Paul Kehrer2015-11-302-2/+2
|/
* Merge pull request #2495 from eakret/masterPaul Kehrer2015-11-287-2/+461
|\ | | | | Add support for 160 bit ARC4 keys
| * Also include arc4 in the toctree in test vectorsEhren Kret2015-11-281-0/+1
| |
| * Fix pep8 lint errorsEhren Kret2015-11-281-9/+18
| |
| * Reference arc4.rst from the test-vectors.rst pageEhren Kret2015-11-281-1/+3
| |
| * Add support for 160 bit ARC4 keysEhren Kret2015-11-286-1/+448
|/
* Merge pull request #2490 from tiran/more_ex_dataPaul Kehrer2015-11-203-0/+20
|\ | | | | Add more CRYPTO_EX_DATA functions
| * Add more CRYPTO_EX_DATA functionsChristian Heimes2015-11-203-0/+20
|/ | | | | | | | The patch adds a couple of additional functions to create, store and retrieve ex_data on SSL, SSL_CTX and X509 objects. It also adds the missing get_ex_new_index function for X509_STORE_CTX. Signed-off-by: Christian Heimes <cheimes@redhat.com>