Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | The correct name for EDH is DHE, likewise EECDH should be ECDHE. | jsing | 2014-07-12 | 1 | -14/+14 |
| | | | | | | Based on changes to OpenSSL trunk. ok beck@ miod@ | ||||
* | Remove remnants from PSK, KRB5 and SRP. | jsing | 2014-07-12 | 1 | -59/+3 |
| | | | | ok beck@ miod@ | ||||
* | Make disabling last cipher work. | guenther | 2014-07-12 | 1 | -9/+9 |
| | | | | | From Thijs Alkemade via OpenSSL trunk ok miod@ | ||||
* | Remove the PSK code. We don't need to drag around this | beck | 2014-07-11 | 1 | -3/+1 |
| | | | | | baggage. ok miod@ jsing@ | ||||
* | Remove more compression tendrils. | jsing | 2014-07-10 | 1 | -5/+1 |
| | | | | ok tedu@ | ||||
* | Remove more compression related code. | jsing | 2014-07-10 | 1 | -10/+1 |
| | |||||
* | Put back some parts of the public SSL API that should not have been | jsing | 2014-07-10 | 1 | -1/+19 |
| | | | | completely decompressed. | ||||
* | decompress libssl. ok beck jsing | tedu | 2014-07-10 | 1 | -173/+2 |
| | |||||
* | Clean up and simplify SSL_CIPHER_description by always using asprintf. If | jsing | 2014-07-09 | 1 | -54/+54 |
| | | | | | | | a buffer was supplied then we copy the result into it. Also make the failure case return values match the documentation. Joint work with beck@ | ||||
* | tedu the SSL export cipher handling - since we do not have enabled export | jsing | 2014-07-09 | 1 | -53/+11 |
| | | | | | | ciphers we no longer need the flags or code to support it. ok beck@ miod@ | ||||
* | Remove SSL_FIPS. | jsing | 2014-07-08 | 1 | -8/+1 |
| | | | | ok deraadt@ miod@ | ||||
* | Use asprintf() instead of a fixed 128-byte size in SSL_CIPHER_description() | miod | 2014-06-18 | 1 | -11/+11 |
| | | | | | | when no storage buffer is passed. ok deraadt@ tedu@ | ||||
* | In SSL_COMP_add_compression_method(), make sure error cases actually return | miod | 2014-06-18 | 1 | -2/+2 |
| | | | | | | `error' rather than `success'. ok deraadt@ | ||||
* | Add ChaCha20-Poly1305 based ciphersuites. | jsing | 2014-06-13 | 1 | -2/+14 |
| | | | | | | Based on Adam Langley's chromium patches. Tested by and ok sthen@ | ||||
* | tags as requested by miod and tedu | deraadt | 2014-06-12 | 1 | -1/+1 |
| | |||||
* | Add an SSL_CIPHER_ALGORITHM2_AEAD flag that is used to mark a cipher as | jsing | 2014-06-08 | 1 | -0/+38 |
| | | | | | using EVP_AEAD. Also provide an EVP_AEAD-only equivalent of ssl_cipher_get_evp(). | ||||
* | Use C99 initialisers for cipher_aliases. This improves readability, | jsing | 2014-06-01 | 1 | -92/+332 |
| | | | | | | | | removes the need for zero values to be specified (meaning that we usually specify two fields instead of 12), makes the field names grepable and protects from future field reordering/removal. ok beck@ miod@ | ||||
* | More KNF. | jsing | 2014-05-30 | 1 | -56/+73 |
| | |||||
* | unidef DH, ECDH, and ECDSA. there's no purpose to a libssl without them. | tedu | 2014-05-29 | 1 | -11/+0 |
| | | | | ok deraadt jsing | ||||
* | repair KNF indent | deraadt | 2014-05-29 | 1 | -1/+1 |
| | |||||
* | Wrap some long lines. | jsing | 2014-05-27 | 1 | -4/+8 |
| | |||||
* | Remove MemCheck_{on,off} that escaped last time around. | jsing | 2014-05-27 | 1 | -4/+0 |
| | |||||
* | More KNF. | jsing | 2014-05-27 | 1 | -2/+2 |
| | |||||
* | Unchecked malloc() return value in SSL_COMP_add_compression_method(), in the | miod | 2014-05-26 | 1 | -0/+4 |
| | | | | | !OPENSSL_NO_COMP case. Does not affect OpenBSD as we compile the opposite code path. | ||||
* | Remove TLS_DEBUG, SSL_DEBUG, CIPHER_DEBUG and OPENSSL_RI_DEBUG. Much of | jsing | 2014-05-25 | 1 | -13/+0 |
| | | | | | | | this is sporadic, hacked up and can easily be put back in an improved form should we ever need it. ok miod@ | ||||
* | Turn off MemCheck_on and MemCheck_off. These calls are pointless since the | jsing | 2014-05-25 | 1 | -2/+0 |
| | | | | | | crypto memory debugging code has been castrated. ok miod@ "kill it" beck@ | ||||
* | The ssl_ciper_get_evp() function is currently overloaded to also return the | jsing | 2014-05-25 | 1 | -22/+32 |
| | | | | | | | | | | | compression associated with the SSL session. Based on one of Adam Langley's chromium diffs, factor out the compression handling code into a separate ssl_cipher_get_comp() function. Rewrite the compression handling code to avoid pointless duplication and so that failures are actually returned to and detectable by the caller. ok miod@ | ||||
* | In ssl_cipher_get_evp(), fix off-by-one in index validation before accessing | miod | 2014-05-24 | 1 | -2/+2 |
| | | | | | | arrays. "kind of scary" deraadt@, ok guenther@ | ||||
* | KSSL is dead... nuke KSSL_DEBUG from orbit. | jsing | 2014-05-20 | 1 | -14/+0 |
| | | | | ok beck@ miod@ | ||||
* | Remove SRP and Kerberos support from libssl. These are complex protocols | tedu | 2014-05-05 | 1 | -4/+0 |
| | | | | | all on their own and we can't effectively maintain them without using them, which we don't. If the need arises, the code can be resurrected. | ||||
* | switch to reallocarray | tedu | 2014-04-22 | 1 | -2/+2 |
| | |||||
* | use mallocarray(a,b) instead of malloc(a*b) | deraadt | 2014-04-21 | 1 | -2/+2 |
| | |||||
* | more malloc/realloc/calloc cleanups; ok beck kettenis | deraadt | 2014-04-21 | 1 | -2/+2 |
| | |||||
* | Use calloc(a,b) instead of malloc(a*b) + memset(a*b). I don't know if | deraadt | 2014-04-20 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | this instance is integer-overflowable, but we cannot keep hand-auditing every instance (or apathetically ignoring these issues) when the simple calloc idiom is better in the presence of a good calloc(). It is simply unfeasible to always enter correct range checks before the aggregate size calculation, just go find some 4000 lines of code, REPAIR THEM ALL, then come back and tell me I am wrong. This only works on systems where calloc() does the integer overflow check, but if your system doesn't do this, you need to ask your vendor WHY THEY ARE 10 YEARS BEHIND IN BEST PRACTICE? This is the kind of problem that needs to be solved at the right layer. malloc integer-overflow was implicated in the 2002 OpenSSH hole. OpenSSH and much other code is now written to use calloc(), for instance OpenSSH has 103 calls to it. We feel safer with our use of calloc(). It is a natural approach for us to use calloc(). How safe do you feel on systems which lack that range check in their calloc()? Good writeup from 2006: http://undeadly.org/cgi?action=article&sid=20060330071917 | ||||
* | More KNF and style consistency tweaks | guenther | 2014-04-19 | 1 | -18/+18 |
| | |||||
* | always build in RSA and DSA. ok deraadt miod | tedu | 2014-04-17 | 1 | -7/+0 |
| | |||||
* | Change library to use intrinsic memory allocation functions instead of | beck | 2014-04-17 | 1 | -17/+17 |
| | | | | | | | | OPENSSL_foo wrappers. This changes: OPENSSL_malloc->malloc OPENSSL_free->free OPENSSL_relloc->realloc OPENSSL_freeFunc->free | ||||
* | add back SRP. i was being too greedy. | tedu | 2014-04-16 | 1 | -0/+2 |
| | |||||
* | disentangle SRP code from TLS | tedu | 2014-04-16 | 1 | -2/+0 |
| | |||||
* | repair some whitespace | tedu | 2014-04-15 | 1 | -50/+44 |
| | |||||
* | remove FIPS mode support. people who require FIPS can buy something that | tedu | 2014-04-15 | 1 | -14/+1 |
| | | | | | meets their needs, but dumping it in here only penalizes the rest of us. ok miod | ||||
* | Send the rotIBM stream cipher (ebcdic) to Valhalla to party for eternity | beck | 2014-04-15 | 1 | -4/+0 |
| | | | | | with the bearded ones... some API's that nobody should be using will dissapear with this commit. | ||||
* | Flense all use of BIO_snprintf from ssl source - use the real one instead, | beck | 2014-04-14 | 1 | -4/+7 |
| | | | | | | and allow for the normal posix mandated return values instead of the nonstandard one from BIO_snprintf. ok miod@ | ||||
* | First pass at applying KNF to the OpenSSL code, which almost makes it | jsing | 2014-04-14 | 1 | -713/+680 |
| | | | | | readable. This pass is whitespace only and can readily be verified using tr and md5. | ||||
* | Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery. | miod | 2014-04-13 | 1 | -2/+3 |
| | |||||
* | resolve conflicts | djm | 2012-10-13 | 1 | -14/+119 |
| | |||||
* | OpenSSL 1.0.0f: merge | djm | 2012-01-05 | 1 | -0/+1 |
| | |||||
* | openssl-1.0.0e: resolve conflicts | djm | 2011-11-03 | 1 | -4/+2 |
| | |||||
* | resolve conflicts, fix local changes | djm | 2010-10-01 | 1 | -331/+692 |
| | |||||
* | resolve conflicts | djm | 2009-04-06 | 1 | -1/+1 |
| |