Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | remove double brackets. fixes build with clang. | 2014-07-12 | 1 | -2/+2 | ||
| | | | | ok jsing@ | |||||
* | Provide ssl_version_string() function, which uses one of those modern C | 2014-07-12 | 4 | -28/+31 | ||
| | | | | | | | | constructs (a switch statement) and returns the appropriate string defined by SSL_TXT_* for the given version, including support for DTLSv1 and DTLSv1-bad. Use this function in SSL_get_version() and SSL_SESSION_print(). ok beck@ | |||||
* | Remove extra parenthesis. | 2014-07-12 | 1 | -2/+2 | ||
| | ||||||
* | need_cert is now always true, so remove the variable and associated | 2014-07-12 | 1 | -33/+21 | ||
| | | | | | | conditionals. ok miod@ | |||||
* | if (x) FOO_free(x) -> FOO_free(x). | 2014-07-12 | 2 | -14/+8 | ||
| | | | | | | | Improves readability, keeps the code smaller so that it is warmer in your cache. review & ok deraadt@ | |||||
* | Remove remnants from PSK, KRB5 and SRP. | 2014-07-12 | 8 | -159/+43 | ||
| | | | | ok beck@ miod@ | |||||
* | Place comments in a block above the if statement, rather than attempting | 2014-07-12 | 2 | -47/+63 | ||
| | | | | | to interleave them within the conditions. Also fix wrapping and indentation. | |||||
* | Make disabling last cipher work. | 2014-07-12 | 1 | -9/+9 | ||
| | | | | | From Thijs Alkemade via OpenSSL trunk ok miod@ | |||||
* | As reported by David Ramos, most consumer of ssl_get_message() perform late | 2014-07-11 | 3 | -53/+148 | ||
| | | | | | | | | | | | | | | | | | | bounds check, after reading the 2-, 3- or 4-byte size of the next chunk to process. But the size fields themselves are not checked for being entirely contained in the buffer. Since reading past your bounds is bad practice, and may not possible if you are using a secure memory allocator, we need to add the necessary bounds check, at the expense of some readability. As a bonus, a wrong size GOST session key will now trigger an error instead of a printf to stderr and it being handled as if it had the correct size. Creating this diff made my eyes bleed (in the real sense); reviewing it made guenther@'s and beck@'s eyes bleed too (in the literal sense). ok guenther@ beck@ | |||||
* | If the application uses tls_session_secret_cb for session resumption, set | 2014-07-11 | 1 | -2/+3 | ||
| | | | | the CCS_OK flag. From OpenSSL trunk. | |||||
* | In ssl3_get_cert_verify(), allow for larger messages to accomodate keys | 2014-07-11 | 1 | -3/+2 | ||
| | | | | | larger than 4096-bit RSA which the most paranoid of us are using; OpenSSL PR #319 via OpenSSL trunk. | |||||
* | Accept CCS again after `finished' has been sent by the client; at this point | 2014-07-11 | 1 | -5/+6 | ||
| | | | | | | | keys have been correctly set up so it is ok to accept CCS from the server. Without renegotiation can sometimes fail. OpenSSL PR #3400 via OpenSSL trunk. | |||||
* | In dtls1_clear_queues(), free buffered_add_data.q correctly, it's made of | 2014-07-11 | 1 | -4/+4 | ||
| | | | | | | DTLS1_RECORD_DATA, not hm_fragment. OpenSSL PR #3286 via OpenSSL trunk. | |||||
* | In ssl3_get_client_key_exchange() parsing a GOST session key, invoke the | 2014-07-11 | 1 | -13/+8 | ||
| | | | | | regular ASN.1 parser rather than trying to handroll one and potentially misbehave; OpenSSL PR #3335 via OpenSSL trunk. | |||||
* | Missing initialization for error line in error paths; from Coverity via | 2014-07-11 | 1 | -1/+4 | ||
| | | | | OpenSSL trunk. | |||||
* | Remove the PSK code. We don't need to drag around this | 2014-07-11 | 11 | -653/+12 | ||
| | | | | | baggage. ok miod@ jsing@ | |||||
* | No need to keep ssl23_foo() flavours mapping to ssl3_foo(). | 2014-07-11 | 5 | -45/+14 | ||
| | | | | ok tedu@ | |||||
* | remove unused variable from ssl3_get_client_hello | 2014-07-10 | 1 | -3/+2 | ||
| | | | | ok tedu@ miod@ | |||||
* | Remove more compression tendrils. | 2014-07-10 | 3 | -14/+4 | ||
| | | | | ok tedu@ | |||||
* | Remove more compression related code. | 2014-07-10 | 3 | -20/+3 | ||
| | ||||||
* | Put back some parts of the public SSL API that should not have been | 2014-07-10 | 3 | -4/+28 | ||
| | | | | completely decompressed. | |||||
* | decompress libssl. ok beck jsing | 2014-07-10 | 25 | -758/+39 | ||
| | ||||||
* | KNF comments, reflowing and moving out of the middle of argument lists in | 2014-07-10 | 3 | -93/+150 | ||
| | | | | | | places ok jsing@ | |||||
* | remove unused ecc_pkey_size. | 2014-07-10 | 1 | -4/+2 | ||
| | | | | ok jsing@ miod@ | |||||
* | Remove leading underscore from _BYTE_ORDER and _{LITTLE,BIG}_ENDIAN, to be | 2014-07-09 | 1 | -2/+2 | ||
| | | | | | more friendly to systems where the underscore flavours may be defined as empty. Found the hard way be bcook@; joint brainstrom with bcook beck and guenther | |||||
* | Clean up and simplify SSL_CIPHER_description by always using asprintf. If | 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 | 2014-07-09 | 11 | -385/+48 | ||
| | | | | | | ciphers we no longer need the flags or code to support it. ok beck@ miod@ | |||||
* | remove unused, private version strings except SSL_version_str | 2014-07-09 | 3 | -8/+3 | ||
| | | | | | | Also remove unused des_ver.h, which exports some of these strings, but is not installed. ok miod@ tedu@ | |||||
* | Mark the weakened 40-bit export ciphers as invalid - no one in their right | 2014-07-08 | 1 | -9/+9 | ||
| | | | | | | mind should be using them. ok deraadt@ miod@ | |||||
* | Remove SSL_FIPS. | 2014-07-08 | 3 | -94/+86 | ||
| | | | | ok deraadt@ miod@ | |||||
* | Nuke SSL_NOT_EXP since it does nothing. | 2014-07-08 | 2 | -126/+125 | ||
| | | | | ok deraadt@ miod@ | |||||
* | pedantic avoidance of division by zero, likely not actually | 2014-07-08 | 1 | -1/+6 | ||
| | | | | | possible to hit for real. ok miod@ jsing@ | |||||
* | Memory leak in error path of the day, from clang via dhill@bitrig; | 2014-07-02 | 1 | -2/+3 | ||
| | | | | ok dhill@bitrig | |||||
* | fix the identical leak in three different files. | 2014-06-30 | 3 | -6/+9 | ||
| | | | | reported by Brent Cook, original diff by logan | |||||
* | More KNF. | 2014-06-29 | 1 | -32/+49 | ||
| | ||||||
* | Fix 2 memory leaks. | 2014-06-28 | 1 | -1/+3 | ||
| | | | | | | (Thanks to Brent Cook) OK from tedu@ | |||||
* | KNF, particularly wrapped lines of calls to PEM_read_bio_FOO() and | 2014-06-22 | 1 | -24/+44 | ||
| | | | | | | multiline comments ok jsing@ | |||||
* | always compare memcmp against 0, for clarity. | 2014-06-21 | 3 | -7/+7 | ||
| | ||||||
* | Pull the code that builds a DTLS sequence number out into its own function | 2014-06-21 | 3 | -23/+29 | ||
| | | | | | | to avoid duplication. Also use fewer magic numbers. ok miod@ | |||||
* | Specify the correct strength bits for 3DES cipher suites. | 2014-06-21 | 1 | -15/+13 | ||
| | | | | | | From OpenSSL. ok miod@ | |||||
* | Pull out the sequence number selection and handle this up front. Also, the | 2014-06-21 | 1 | -9/+6 | ||
| | | | | correct record is already known, so avoid reassignment. | |||||
* | More KNF and clean up. | 2014-06-21 | 1 | -13/+9 | ||
| | ||||||
* | Fix memory leak in error path. | 2014-06-21 | 1 | -2/+2 | ||
| | | | | OK from miod@ | |||||
* | convert CRYPTO_memcmp to timingsafe_memcmp based on current policy favoring | 2014-06-19 | 9 | -22/+22 | ||
| | | | | | | libc interfaces over libcrypto interfaces. for now we also prefer timingsafe_memcmp over timingsafe_bcmp, even when the latter is acceptable. ok beck deraadt matthew miod | |||||
* | In ssl3_send_newsession_ticket(), fix a memory leak in an error path. | 2014-06-18 | 1 | -2/+4 | ||
| | ||||||
* | Missinc calloc() return value check; ok deraadt@ | 2014-06-18 | 1 | -1/+5 | ||
| | ||||||
* | Make sure to always invoke EVP_CIPHER_CTX_cleanup() before returning in the | 2014-06-18 | 1 | -4/+10 | ||
| | | | | | | error paths from tls_decrypt_ticket(). ok tedu@ | |||||
* | Use asprintf() instead of a fixed 128-byte size in SSL_CIPHER_description() | 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 | 2014-06-18 | 1 | -2/+2 | ||
| | | | | | | `error' rather than `success'. ok deraadt@ | |||||
* | ssl_session_cmp is not a sort function, can use CRYPTO_memcmp here too. | 2014-06-17 | 1 | -2/+4 | ||
| |