Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More memory leaks and unchecked allocations; OpenSSL PR #3403 via OpenSSL | miod | 2014-07-11 | 4 | -7/+19 |
| | | | | trunk. (note we had already fixed some of the issues in that PR independently) | ||||
* | Make sure BN_sqr never returns negative numbers. | miod | 2014-07-11 | 1 | -1/+2 |
| | | | | OpenSSL PR #3400 via OpenSSL trunk. | ||||
* | Accept CCS again after `finished' has been sent by the client; at this point | miod | 2014-07-11 | 2 | -10/+12 |
| | | | | | | | 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 | miod | 2014-07-11 | 2 | -8/+8 |
| | | | | | | DTLS1_RECORD_DATA, not hm_fragment. OpenSSL PR #3286 via OpenSSL trunk. | ||||
* | Fix version number processing in cms_sd_set_version(); OpenSSL PR #3249 via | miod | 2014-07-11 | 1 | -3/+3 |
| | | | | OpenSSL trunk. | ||||
* | Remove duplicate 0x for salt len in output; Martin Kaiser via OpenSSL trunk. | miod | 2014-07-11 | 1 | -2/+2 |
| | |||||
* | When looking for the issuer of a certificate, if the current candidate is | miod | 2014-07-11 | 3 | -13/+97 |
| | | | | | | | expired or not valid yet, continue looking; only return an expired certificate if no valid certificates have been found. OpenSSL PR #3359 via OpenSSL trunk. | ||||
* | In ssl3_get_client_key_exchange() parsing a GOST session key, invoke the | miod | 2014-07-11 | 2 | -26/+16 |
| | | | | | regular ASN.1 parser rather than trying to handroll one and potentially misbehave; OpenSSL PR #3335 via OpenSSL trunk. | ||||
* | Missing calloc() return value check in dgram_sctp_ctrl(); from Kurt Roeckx via | miod | 2014-07-11 | 1 | -11/+21 |
| | | | | OpenSSL trunk | ||||
* | Make CMS_decrypt_set1_pkey() return an error if no recipient type matches, | miod | 2014-07-11 | 1 | -3/+4 |
| | | | | instead of returning a random key; OpenSSL PR #3348 via OpenSSL trunk | ||||
* | Missing initialization for error line in error paths; from Coverity via | miod | 2014-07-11 | 2 | -2/+8 |
| | | | | OpenSSL trunk. | ||||
* | Missing initialization; OpenSSL PR#3289 and #3345 via OpenSSL trunk. | miod | 2014-07-11 | 1 | -2/+3 |
| | |||||
* | Provide correct version details for LibreSSL. | jsing | 2014-07-11 | 1 | -77/+3 |
| | | | | ok beck@ deraadt@ miod@ | ||||
* | Clean up versioning and remove #ifdefs that we do not define. | jsing | 2014-07-11 | 1 | -34/+9 |
| | | | | ok beck@ | ||||
* | Suspicions confirmed by sthen's searching that nothing uses ossl_ssize_t | deraadt | 2014-07-11 | 1 | -3/+1 |
| | | | | except embedded openssl's in other trees. | ||||
* | pour some water on an ass ember | deraadt | 2014-07-11 | 1 | -1/+1 |
| | | | | spotted by doctor jsing, always keeping an eye out for these | ||||
* | Fetch the specific license which will be used from | deraadt | 2014-07-11 | 1 | -0/+24 |
| | | | | | | https://www.openssl.org/~appro/camellia/dist/BSD_license.txt It isn't our concern to supply the other licences mentioned in source files; that is realy not our problem. | ||||
* | Remove the commentary about the majority of this code being under | deraadt | 2014-07-11 | 2 | -6/+4 |
| | | | | | | | 'BSD-style Open Source licenses'. It is a bit improper of OpenSSL to classify themselves into the BSD community without a clear justification for the extra clauses / terms... | ||||
* | More e_os2.h clean up. Also move the includes inside the guard. | jsing | 2014-07-11 | 1 | -20/+12 |
| | | | | ok deraadt@ who also has a similar diff. | ||||
* | Revert change that snuck into previous commit. | jsing | 2014-07-11 | 1 | -3/+1 |
| | |||||
* | Remove the PSK code. We don't need to drag around this | beck | 2014-07-11 | 25 | -1507/+27 |
| | | | | | baggage. ok miod@ jsing@ | ||||
* | The only thing openssl is consistant about is inconsistancy, so there | deraadt | 2014-07-11 | 2 | -2/+2 |
| | | | | | | | are many variations of their license and we need to say: licenses which follow: rather than license which follows: | ||||
* | say hi to the bitbucket | deraadt | 2014-07-11 | 5 | -12388/+0 |
| | |||||
* | replace u_int8_t with uint8_t | bcook | 2014-07-11 | 1 | -3/+5 |
| | | | | ok beck@ | ||||
* | Only import cryptlib.h in the four source files that actually need it. | jsing | 2014-07-11 | 345 | -1097/+1145 |
| | | | | | | | | Remove the openssl public includes from cryptlib.h and add a small number of includes into the source files that actually need them. While here, also sort/group/tidy the includes. ok beck@ miod@ | ||||
* | Add a small note about LibReSSL at the start of this. | beck | 2014-07-11 | 2 | -0/+14 |
| | | | | ok jsing@ | ||||
* | No need to keep ssl23_foo() flavours mapping to ssl3_foo(). | miod | 2014-07-11 | 9 | -86/+24 |
| | | | | ok tedu@ | ||||
* | Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was | jsing | 2014-07-11 | 2 | -8/+1 |
| | | | | removed from opensslconf.h, this would no longer compile. | ||||
* | Explicitly include <openssl/opensslconf.h> in every file that references | jsing | 2014-07-10 | 197 | -275/+731 |
| | | | | | | | | | an OPENSSL_NO_* define. This avoids relying on something else pulling it in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is never going to do anything, since OPENSSL_NO_XYZ will never defined, due to the fact that opensslconf.h has not been included. This also includes some miscellaneous sorting/tidying of headers. | ||||
* | OPENSSL_stderr() is unused so nuke it. OPENSSL_showfatal() is only used by | jsing | 2014-07-10 | 2 | -12/+3 |
| | | | | | | OpenSSLDie(), which is in the same file, so just make it static. ok miod@ | ||||
* | Use size_t as realloc() size argument whenever possible. ok tedu@ | miod | 2014-07-10 | 2 | -6/+8 |
| | |||||
* | Simplify realloc() usage; ok tedu@ | miod | 2014-07-10 | 1 | -15/+6 |
| | |||||
* | Upon realloc() failure, free() the original pointer and remove the stupid | miod | 2014-07-10 | 1 | -3/+3 |
| | | | | | comments implying you don't have to. ok tedu@ | ||||
* | KNF | miod | 2014-07-10 | 1 | -26/+34 |
| | |||||
* | Fix a double free in a can't-fail error path in PKCS7_decrypt(), by removing | miod | 2014-07-10 | 1 | -10/+6 |
| | | | | | the error path altogether and simplifying the local variables as a result. joint work with jsing@; ok jsing@ tedu@ | ||||
* | remove unused variable from ssl3_get_client_hello | bcook | 2014-07-10 | 2 | -6/+4 |
| | | | | ok tedu@ miod@ | ||||
* | Inline the only use of the HEX_SIZE macro and nuke both DECIMAL_SIZE and | jsing | 2014-07-10 | 2 | -7/+3 |
| | | | | | | HEX_SIZE. ok beck@ miod@ | ||||
* | Make sure srp_Calc_k() digest operations are checked for error; from | miod | 2014-07-10 | 1 | -9/+17 |
| | | | | Florian Zumbiehl (florz , florz . de) on tech@ | ||||
* | Make sure SRP_Calc_client_key() returns NULL instead of a pristine BN_new() | miod | 2014-07-10 | 1 | -4/+9 |
| | | | | upon error; from Florian Zumbiehl (florz , florz . de) on tech@ | ||||
* | Nuke OPENSSL_NONPIC_relocated since nothing uses it. | jsing | 2014-07-10 | 2 | -4/+2 |
| | | | | ok miod@ | ||||
* | Kill a blatantly outdated (and now wrong) comment | miod | 2014-07-10 | 1 | -4/+1 |
| | |||||
* | Fix examples description, and use less ambiguous wording. | miod | 2014-07-10 | 1 | -4/+4 |
| | |||||
* | Try and fix the horrible coding style of the example code snippets. | miod | 2014-07-10 | 12 | -220/+244 |
| | |||||
* | Stop including standard headers via cryptlib.h - pull in the headers that | jsing | 2014-07-10 | 134 | -210/+453 |
| | | | | | | are needed in the source files that actually require them. ok beck@ miod@ | ||||
* | Remove empty sections and references to des_modes(7) which we don't have. | miod | 2014-07-10 | 45 | -145/+28 |
| | |||||
* | Fewer lies, also do not document DES_3cbc_encrypt anymore. | miod | 2014-07-10 | 1 | -22/+6 |
| | |||||
* | Features introduce in OpenSSL 0.9.8 do not deserve their own section. | miod | 2014-07-10 | 1 | -21/+19 |
| | | | | | Instead, fold their description in the main documentation, and update the history section to mention them as well. | ||||
* | Attempt to (incompletely) document EVP_aes_*(). | miod | 2014-07-10 | 4 | -13/+15 |
| | | | | | | | | | When EVP_des_cbc() was suggested, suggest EVP_aes_256_cbc() instead. Remove mention of EVP_des_ede3_cbc() being the algorithm of choice for S/MIME. Don't mention US-export limited RC2 algorithms, you'd better not know about them. | ||||
* | RSA_setup_blinding() gets a BN with BN_CTX_get(), returns `out of memory' | miod | 2014-07-10 | 1 | -6/+1 |
| | | | | | | | | if it fails, then never uses it anymore, and may invoke a function which needs more than one BN from the BN_CTX anyway, so this is pointless - remove the BN_CTX_get() call and the test. ok jsing | ||||
* | make asn1 free safe to call with null pointers of any type. | tedu | 2014-07-10 | 1 | -4/+3 |
| | | | | ok jsing miod |