aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove critical flag from cert issuer entry ext to work with OpenSSL < 1.0.0Erik Trauschke2015-09-031-34/+33
* Merge pull request #2319 from alex/x509-tutorial-docs-bugPaul Kehrer2015-09-031-6/+9
|\
| * Fixed #2318 -- added the missing critical flag to the x509 tutorialAlex Gaynor2015-09-031-6/+9
|/
* Merge pull request #2316 from pyca/pypy-2.6.1Paul Kehrer2015-09-012-5/+5
|\
| * fixAlex Gaynor2015-09-011-1/+1
| * upgrade to pypy 2.6.1Alex Gaynor2015-09-011-4/+4
|/
* Merge pull request #2304 from Ayrx/fernet-docs-kdfPaul Kehrer2015-08-302-0/+42
|\
| * Add bcrypt to word list.Terry Chia2015-08-301-0/+1
| * Mention bcrypt and scrypt.Terry Chia2015-08-301-1/+2
| * Fix imports and wordings.Terry Chia2015-08-291-5/+6
| * Add Django to wordlist.Terry Chia2015-08-291-0/+1
| * Fixed PBKDF2 class target.Terry Chia2015-08-291-1/+1
| * Fix link.Terry Chia2015-08-291-1/+1
| * Add some text regarding using passwords with Fernet.Terry Chia2015-08-291-0/+38
* | Merge pull request #2307 from reaperhulk/fix-test-orderingAlex Gaynor2015-08-292-7/+6
|\ \
| * | Resolve an unusual test bug related to initializing the bindingsPaul Kehrer2015-08-292-7/+6
|/ /
* | Merge pull request #2305 from alex/drop-nsa-linkPaul Kehrer2015-08-291-4/+4
|\ \ | |/ |/|
| * line lengthAlex Gaynor2015-08-291-4/+4
| * spellingAlex Gaynor2015-08-291-1/+1
| * Fixed #2270 -- update citation to something that worksAlex Gaynor2015-08-291-5/+5
|/
* Merge pull request #2303 from kjav/masterPaul Kehrer2015-08-281-0/+1
|\
| * Removed SSL_renegotiate_abbreviated bindingkjav2015-08-281-1/+0
| * Added bindings for SSL_renegotiate_<pending/abbreviated>kjav2015-08-281-0/+2
| * Merge pull request #1 from pyca/masterkjav2015-08-281-0/+1
| |\ | |/ |/|
* | Merge pull request #2302 from Ayrx/add-ssl-renegotiateAlex Gaynor2015-08-281-0/+1
|\ \ | |/ |/|
| * Add SSL_renegotiate binding.Terry Chia2015-08-281-0/+1
|/
* Merge pull request #2296 from reaperhulk/correct-my-review-mistakeAlex Gaynor2015-08-271-1/+5
|\
| * add conditional removal for SET_CERT_CBPaul Kehrer2015-08-251-1/+5
* | Merge pull request #2297 from fxfitz/patch-1Alex Gaynor2015-08-271-1/+1
|\ \
| * | Update fernet.rst - removed a word!Fran Fitzpatrick2015-08-251-1/+1
| |/
* | Merge pull request #2298 from timbuchwaldt/patch-1Alex Gaynor2015-08-261-2/+2
|\ \ | |/ |/|
| * Write as binaryTim Buchwaldt2015-08-261-2/+2
|/
* Merge pull request #2295 from mhils/set_cert_cbPaul Kehrer2015-08-251-0/+17
|\
| * add set_cert_cbMaximilian Hils2015-08-251-0/+17
|/
* Merge pull request #2292 from reaperhulk/default-stringmaskAlex Gaynor2015-08-221-0/+6
|\
| * set the default stringmask to utf8Paul Kehrer2015-08-221-0/+6
|/
* Merge pull request #2285 from reaperhulk/pypy-errorAlex Gaynor2015-08-201-1/+7
|\
| * raise an error if trying to install on PyPy < 2.6Paul Kehrer2015-08-201-1/+7
|/
* Merge pull request #2282 from reaperhulk/ssl-bindingsAlex Gaynor2015-08-191-0/+8
|\
| * libre doesn't have these fields (and might only be used in sslv2 anyway)Paul Kehrer2015-08-191-2/+0
| * compilation fixPaul Kehrer2015-08-191-2/+4
| * style fix + remove some elements of the struct that aren't in 0.9.8Paul Kehrer2015-08-181-5/+2
| * added attribs to SSL_SESSION, SSL_SESSION_print. CIPHER_descriptionMiWCryptAnalytics2015-08-181-0/+11
* | Merge pull request #2279 from Ayrx/patch-1Alex Gaynor2015-08-191-1/+1
|\ \ | |/ |/|
| * Make py3pep8 tox target use a general python3.Terry Chia2015-08-161-1/+1
|/
* Merge pull request #2276 from viraptor/move-signature-typecheckAlex Gaynor2015-08-153-8/+9
|\
| * Move signature type checksStanisław Pitucha2015-08-143-8/+9
* | Merge pull request #2277 from shadyabhi/patch-1Paul Kehrer2015-08-141-0/+1
|\ \ | |/ |/|
| * Update tutorial.rst as it was missing an importAbhijeet Rastogi2015-08-151-0/+1
|/
* Merge pull request #2274 from reaperhulk/fix-testAlex Gaynor2015-08-121-1/+2
|\