Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Specify the correct strength bits for 3DES cipher suites. | jsing | 2014-06-21 | 1 | -15/+13 |
| | | | | | | From OpenSSL. ok miod@ | ||||
* | Add ChaCha20-Poly1305 based ciphersuites. | jsing | 2014-06-13 | 1 | -1/+52 |
| | | | | | | Based on Adam Langley's chromium patches. Tested by and ok sthen@ | ||||
* | Switch the AES-GCM cipher suites to SSL_CIPHER_ALGORITHM2_AEAD. | jsing | 2014-06-13 | 1 | -21/+68 |
| | |||||
* | Remove support for the `opaque PRF input' extension, which draft has expired | miod | 2014-06-13 | 1 | -55/+1 |
| | | | | | | | | 7 years ago and never made it into an RFC. That code wasn't compiled in anyway unless one would define the actual on-the-wire extension id bytes; crank libssl major. With help and enlightenment from Brendan MacDonell. | ||||
* | tags as requested by miod and tedu | deraadt | 2014-06-12 | 1 | -1/+1 |
| | |||||
* | Remove another NULL check before a BIO_free(). | jsing | 2014-06-07 | 1 | -4/+4 |
| | |||||
* | ssl3_free_digest_list() has its own NULL check. | jsing | 2014-06-07 | 1 | -5/+3 |
| | |||||
* | BIO_free has an implicit NULL check, so do not bother checking for NULL | jsing | 2014-06-07 | 1 | -2/+1 |
| | | | | before calling it. | ||||
* | ssl3_release_{read,write}_buffer() handle being called with NULL buffers, | jsing | 2014-06-07 | 1 | -4/+3 |
| | | | | so do not bother checking before calling. | ||||
* | The DH_free, EC_KEY_free, EVP_PKEY_free and RSA_free functions all have | jsing | 2014-06-07 | 1 | -27/+14 |
| | | | | | implicit NULL checks, so there is no point ensuring that the pointer is non-NULL before calling them. | ||||
* | More manual OPENSSL_NO_EC and OPENSSL_NO_TLSEXT cleanup. | jsing | 2014-05-31 | 1 | -5/+1 |
| | |||||
* | ECDH and ECDSA will not work overly well if there is no EC, so unifdef | jsing | 2014-05-31 | 1 | -6/+0 |
| | | | | | | OPENSSL_NO_EC. ok tedu@ | ||||
* | TLS would not be entirely functional without extensions, so unifdef | jsing | 2014-05-31 | 1 | -14/+0 |
| | | | | | | OPENSSL_NO_TLSEXT. ok tedu@ | ||||
* | remove some #if 0 code. we don't need any more reminders that we're using | tedu | 2014-05-30 | 1 | -9/+0 |
| | | | | a not quite appropriate data structure. ok jsing | ||||
* | Make use of SSL_IS_DTLS, SSL_USE_EXPLICIT_IV, SSL_USE_SIGALGS and | jsing | 2014-05-30 | 1 | -2/+2 |
| | | | | | | SSL_USE_TLS1_2_CIPHERS. Largely based on OpenSSL head. | ||||
* | unidef DH, ECDH, and ECDSA. there's no purpose to a libssl without them. | tedu | 2014-05-29 | 1 | -36/+0 |
| | | | | ok deraadt jsing | ||||
* | Make it substantially easier to identify protocol version requirements | jsing | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | by adding an enc_flags field to the ssl3_enc_method, specifying four flags that are used with this field and providing macros for evaluating these conditions. Currently the version requirements are identified by continually checking the version number and other criteria. This change also adds separate SSL3_ENC_METHOD data for TLS v1.1 and v1.2, since they have different enc_flags from TLS v1. Based on changes in OpenSSL head. No objection from miod@ | ||||
* | There is no point in checking if a pointer is non-NULL before calling free, | jsing | 2014-05-28 | 1 | -25/+14 |
| | | | | | | | | since free already does this for us. Also remove some pointless NULL assignments, where the result from malloc(3) is immediately assigned to the same variable. ok miod@ | ||||
* | Replace the following logic: | miod | 2014-05-26 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | if (nothing to allocate) ptr = malloc(1) else { if ((ptr = malloc(size to allocate)) memcpy(ptr, data to copy, size to allocate) } if (ptr == NULL) OMG ERROR with a saner logic where the NULL pointer check if moved to the actual malloc branch, so that we do not need to malloc a single byte, just to avoid having a NULL pointer. Whoever thought allocating a single byte was a smart idea was obviously not taking his meds. ok beck@ guenther@ | ||||
* | Remove TLS_DEBUG, SSL_DEBUG, CIPHER_DEBUG and OPENSSL_RI_DEBUG. Much of | jsing | 2014-05-25 | 1 | -24/+0 |
| | | | | | | | this is sporadic, hacked up and can easily be put back in an improved form should we ever need it. ok miod@ | ||||
* | Use C99 initialisers for SSL3_ENC_METHOD structs. | jsing | 2014-05-24 | 1 | -14/+16 |
| | | | | ok miod@ | ||||
* | Clean up the SSL cipher initialisation and use C99 initialisers for | jsing | 2014-05-23 | 1 | -1709/+1712 |
| | | | | | | clarity, grepability and to protect from future field reordering/removal. ok miod@ | ||||
* | There are two actual uses of e_os2.h in libssl - an OPENSSL_GLOBAL (an | jsing | 2014-05-22 | 1 | -1/+1 |
| | | | | | | | | | empty define) and an OPENSSL_EXTERN (which is defined as, well... extern). The use of OPENSSL_EXTERN is already inconsistent since the lines above and below just use plain old "extern". Expand the two uses of these macros and stop including e_os2.h in libssl. ok miod@ | ||||
* | Stop including kssl_lcl.h and nuke it from orbit - it is a no-op now. | jsing | 2014-05-22 | 1 | -1/+0 |
| | | | | ok beck@ miod@ | ||||
* | KSSL is dead... nuke KSSL_DEBUG from orbit. | jsing | 2014-05-20 | 1 | -3/+0 |
| | | | | ok beck@ miod@ | ||||
* | deleted seed some time ago | tedu | 2014-05-17 | 1 | -101/+0 |
| | |||||
* | Remove SRP and Kerberos support from libssl. These are complex protocols | tedu | 2014-05-05 | 1 | -445/+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. | ||||
* | More KNF, things that couldn't be verified with md5(1), and some whitespace | mcbride | 2014-04-24 | 1 | -7/+9 |
| | | | | I missed on the first go around. | ||||
* | KNF | mcbride | 2014-04-24 | 1 | -99/+181 |
| | |||||
* | more malloc/realloc/calloc cleanups; ok beck kettenis | deraadt | 2014-04-21 | 1 | -2/+1 |
| | |||||
* | More KNF and style consistency tweaks | guenther | 2014-04-19 | 1 | -8/+9 |
| | |||||
* | spacing | tedu | 2014-04-18 | 1 | -10/+11 |
| | |||||
* | whack a bunch of disabled code. ok beck lteo | tedu | 2014-04-17 | 1 | -169/+0 |
| | |||||
* | always build in RSA and DSA. ok deraadt miod | tedu | 2014-04-17 | 1 | -42/+3 |
| | |||||
* | Change library to use intrinsic memory allocation functions instead of | beck | 2014-04-17 | 1 | -14/+14 |
| | | | | | | | | 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/+209 |
| | |||||
* | disentangle SRP code from TLS | tedu | 2014-04-16 | 1 | -209/+0 |
| | |||||
* | make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod | tedu | 2014-04-14 | 1 | -21/+0 |
| | |||||
* | First pass at applying KNF to the OpenSSL code, which almost makes it | jsing | 2014-04-14 | 1 | -2688/+2605 |
| | | | | | readable. This pass is whitespace only and can readily be verified using tr and md5. | ||||
* | Do not include "e_os.h" anymore. Simply pull in the necessary headers. | mpi | 2014-04-13 | 1 | -2/+2 |
| | | | | ok miod@, deraadt@ | ||||
* | remove more cases of MS_STATIC, MS_CALLBACK, and MS_FAR. Did you | deraadt | 2014-04-13 | 1 | -1/+1 |
| | | | | | | | know that MS_STATIC doesn't mean it is static? How far can lies and half-truths be layered? I wonder if anyone got fooled, and actually returned a pointer.. ok beck | ||||
* | Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery. | miod | 2014-04-13 | 1 | -11/+23 |
| | |||||
* | SECURITY fixes backported from openssl-1.0.1f. ok mikeb@ | jca | 2014-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | CVE-2013-4353 NULL pointer dereference with crafted Next Protocol Negotiation record in TLS handshake. Upstream: 197e0ea CVE-2013-6449 Fix crash with crafted traffic from a TLS 1.2 client. Upstream: ca98926, 0294b2b CVE-2013-6450 Fix DTLS retransmission from previous session. Upstream: 3462896 | ||||
* | resolve conflicts | djm | 2012-10-13 | 1 | -21/+965 |
| | |||||
* | OpenSSL 1.0.0f: merge | djm | 2012-01-05 | 1 | -0/+3 |
| | |||||
* | openssl-1.0.0e: resolve conflicts | djm | 2011-11-03 | 1 | -0/+6 |
| | |||||
* | resolve conflicts, fix local changes | djm | 2010-10-01 | 1 | -772/+1475 |
| | |||||
* | pull Ben Lauries blind prefix injection fix for CVE-2009-3555 from | markus | 2009-11-10 | 1 | -0/+3 |
| | | | | openssl 0.9.8l; crank minor version; ok djm@ deraadt@; initially from jsg@ | ||||
* | update to openssl-0.9.8i; tested by several, especially krw@ | djm | 2009-01-05 | 1 | -20/+20 |
| | |||||
* | resolve conflicts | djm | 2008-09-06 | 1 | -337/+1161 |
| |